From df8ee516a7c556de447322d48d8ac2e4d26c27a4 Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 31 Jan 2013 04:30:12 -0800 Subject: generate better testing openvpn client configs in test/openvpn --- lib/leap_cli/commands/test.rb | 10 ++++++++-- lib/leap_cli/path.rb | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'lib/leap_cli') 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' } -- cgit v1.2.3