diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/leap_cli/commands/compile.rb | 2 | ||||
| -rw-r--r-- | lib/leap_cli/commands/new.rb | 2 | ||||
| -rw-r--r-- | lib/leap_cli/remote/leap_plugin.rb | 2 | ||||
| -rw-r--r-- | lib/leap_cli/remote/tasks.rb | 2 | 
4 files changed, 4 insertions, 4 deletions
| diff --git a/lib/leap_cli/commands/compile.rb b/lib/leap_cli/commands/compile.rb index 8d0c9de..8ef7c6b 100644 --- a/lib/leap_cli/commands/compile.rb +++ b/lib/leap_cli/commands/compile.rb @@ -52,7 +52,7 @@ module LeapCli      def compile_zone_file        hosts_seen = {}        f = $stdout -      f.puts ZONE_HEADER % {:domain => provider.domain, :ns => provider.domain, :contact => provider.contacts.default.sub('@','.')} +      f.puts ZONE_HEADER % {:domain => provider.domain, :ns => provider.domain, :contact => provider.contacts.default.first.sub('@','.')}        max_width = manager.nodes.values.inject(0) {|max, node| [max, relative_hostname(node.domain.full).length].max }        put_line = lambda do |host, line|          host = '@' if host == '' diff --git a/lib/leap_cli/commands/new.rb b/lib/leap_cli/commands/new.rb index dc37265..286fde7 100644 --- a/lib/leap_cli/commands/new.rb +++ b/lib/leap_cli/commands/new.rb @@ -25,7 +25,7 @@ module LeapCli; module Commands    private -  DEFAULT_REPO = 'git://leap.se/leap_platform' # TODO: use https +  DEFAULT_REPO = 'https://leap.se/git/leap_platform.git'    #    # creates a new provider directory diff --git a/lib/leap_cli/remote/leap_plugin.rb b/lib/leap_cli/remote/leap_plugin.rb index f5bf490..04b1e2c 100644 --- a/lib/leap_cli/remote/leap_plugin.rb +++ b/lib/leap_cli/remote/leap_plugin.rb @@ -6,7 +6,7 @@  module LeapCli; module Remote; module LeapPlugin    def required_packages -    "puppet ruby-hiera-puppet rsync lsb-release" +    "puppet ruby-hiera-puppet rsync lsb-release locales"    end    def log(*args, &block) diff --git a/lib/leap_cli/remote/tasks.rb b/lib/leap_cli/remote/tasks.rb index 0721c34..5b0418a 100644 --- a/lib/leap_cli/remote/tasks.rb +++ b/lib/leap_cli/remote/tasks.rb @@ -14,13 +14,13 @@ end  task :install_prerequisites, :max_hosts => MAX_HOSTS do    leap.mkdirs LeapCli::PUPPET_DESTINATION -  run "echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen; locale-gen"    leap.log :updating, "package list" do      run "apt-get update"    end    leap.log :installing, "required packages" do      run "DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Options::=--force-confold install #{leap.required_packages}"    end +  run "echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen; locale-gen"    leap.mkdirs("/etc/leap", "/srv/leap")    leap.mark_initialized  end | 
