aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-01-31 04:30:12 -0800
committerelijah <elijah@riseup.net>2013-01-31 04:30:12 -0800
commitdf8ee516a7c556de447322d48d8ac2e4d26c27a4 (patch)
tree7097f94eb7ecae86d56ad1b8acfe167eb762ceca
parente8ae3f3fd59f86e59ef511d62d31eacaf3d7c17b (diff)
downloadleap_cli-df8ee516a7c556de447322d48d8ac2e4d26c27a4.tar.gz
leap_cli-df8ee516a7c556de447322d48d8ac2e4d26c27a4.tar.bz2
generate better testing openvpn client configs in test/openvpn
-rw-r--r--lib/leap_cli/commands/test.rb10
-rw-r--r--lib/leap_cli/path.rb4
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/leap_cli/commands/test.rb b/lib/leap_cli/commands/test.rb
index dd505b6..e895a5e 100644
--- a/lib/leap_cli/commands/test.rb
+++ b/lib/leap_cli/commands/test.rb
@@ -24,8 +24,14 @@ module LeapCli; module Commands
def generate_test_client_openvpn_config
template = read_file! Path.find_file(:test_client_openvpn_template)
- config = Util.erb_eval(template, binding)
- write_file! :test_client_openvpn_config, config
+
+ ['production', 'testing', 'local'].each do |tag|
+ vpn_nodes = manager.nodes[:tags => tag][:services => 'openvpn']
+ if vpn_nodes.any?
+ config = Util.erb_eval(template, binding)
+ write_file! ('test_openvpn_'+tag).to_sym, config
+ end
+ end
end
end; end
diff --git a/lib/leap_cli/path.rb b/lib/leap_cli/path.rb
index bfd3c9a..7628628 100644
--- a/lib/leap_cli/path.rb
+++ b/lib/leap_cli/path.rb
@@ -51,7 +51,9 @@ module LeapCli; module Path
# testing files
:test_client_key => 'test/cert/client.key',
:test_client_cert => 'test/cert/client.crt',
- :test_client_openvpn_config => 'test/openvpn/client.ovpn',
+ :test_openvpn_production => 'test/openvpn/production.ovpn',
+ :test_openvpn_testing => 'test/openvpn/testing.ovpn',
+ :test_openvpn_local => 'test/openvpn/local.ovpn',
:test_client_openvpn_template => 'test/openvpn/client.ovpn.erb'
}