From 5e021210f883ffa72dbadee75bd02a7f7319ca17 Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 21 Sep 2013 18:50:47 -0700 Subject: fix for: locale-gen should be run after package "locales" is installed (Bug #3741) --- lib/leap_cli/remote/leap_plugin.rb | 2 +- lib/leap_cli/remote/tasks.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/leap_cli') 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 -- cgit v1.2.3 From b342e7e4a81e0bb6186a29a634c3aa4d979fe143 Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 21 Sep 2013 19:03:53 -0700 Subject: use https:// instead of git:// --- lib/leap_cli/commands/new.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/leap_cli') 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 -- cgit v1.2.3 From f2746ddc5a4cdf104970d3998ad33303a2af74fb Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 15 Oct 2013 11:22:25 -0700 Subject: fix `compile zone` (contacts.default is now always an array) --- lib/leap_cli/commands/compile.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/leap_cli') 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 == '' -- cgit v1.2.3