Download as
Browse Code »

Commit 23a7805fe29848a647b2ac5347a39c4188e869a8

Authored by Antonio Terceiro
1 parent 3e39c878
Exists in master and in 67 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup, backup_not_prod, button_suspension_points_remove, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Use separate SSH configs per environment 

Requires chake > 0.4
Showing 2 changed files with 12 additions and 5 deletions   Show diff stats
1 /utils/obs/isv* 1 /utils/obs/isv*
2 /Gemfile.lock 2 /Gemfile.lock
3 -/.ssh_config 3 +/config/development/ssh_config
4 /.tmp 4 /.tmp
5 /tmp 5 /tmp
6 /docs/_build 6 /docs/_build
1 -require 'chake'  
2 -  
3 $SPB_ENV = ENV.fetch('SPB_ENV', 'development') 1 $SPB_ENV = ENV.fetch('SPB_ENV', 'development')
4 2
  3 +ssh_config_file = "config/#{$SPB_ENV}/ssh_config"
5 ips_file = "config/#{$SPB_ENV}/ips.yaml" 4 ips_file = "config/#{$SPB_ENV}/ips.yaml"
6 config_file = "config/#{$SPB_ENV}/config.yaml" 5 config_file = "config/#{$SPB_ENV}/config.yaml"
7 6
  7 +ENV['CHAKE_SSH_CONFIG'] = ssh_config_file
  8 +
  9 +require 'chake'
  10 +
  11 +if Chake::VERSION < '0.4'
  12 + fail "Please upgrade to chake 0.4+"
  13 +end
  14 +
8 config = YAML.load_file(config_file) 15 config = YAML.load_file(config_file)
9 ips = YAML.load_file(ips_file) 16 ips = YAML.load_file(ips_file)
10 $nodes.each do |node| 17 $nodes.each do |node|
@@ -24,7 +31,7 @@ end @@ -24,7 +31,7 @@ end
24 task :default => :test 31 task :default => :test
25 32
26 file 'ssh_config.erb' 33 file 'ssh_config.erb'
27 -file '.ssh_config' => ['nodes.yaml', ips_file,'ssh_config.erb'] do |t| 34 +file 'config/development/ssh_config' => ['nodes.yaml', 'config/development/ips.yaml', 'ssh_config.erb'] do |t|
28 require 'erb' 35 require 'erb'
29 template = ERB.new(File.read('ssh_config.erb')) 36 template = ERB.new(File.read('ssh_config.erb'))
30 File.open(t.name, 'w') do |f| 37 File.open(t.name, 'w') do |f|
@@ -33,7 +40,7 @@ file &#39;.ssh_config&#39; =&gt; [&#39;nodes.yaml&#39;, ips_file,&#39;ssh_config.erb&#39;] do |t| @@ -33,7 +40,7 @@ file &#39;.ssh_config&#39; =&gt; [&#39;nodes.yaml&#39;, ips_file,&#39;ssh_config.erb&#39;] do |t|
33 puts 'ERB %s' % t.name 40 puts 'ERB %s' % t.name
34 end 41 end
35 42
36 -task :bootstrap_common => '.ssh_config' 43 +task :bootstrap_common => 'config/development/ssh_config'
37 44
38 unless ENV['nodeps'] 45 unless ENV['nodeps']
39 task 'converge:integration' => 'converge:database' 46 task 'converge:integration' => 'converge:database'