diff options
| author | Justin Lambert <jlambert@eml.cc> | 2013-01-15 09:09:20 -0700 |
|---|---|---|
| committer | Justin Lambert <jlambert@eml.cc> | 2013-01-15 09:09:20 -0700 |
| commit | 823c2587d51f8b6b5d82389f08b5c901ab84e3a2 (patch) | |
| tree | 5a8873cde7fa6e92b05e2af04dae732942124c16 | |
| parent | 3a81ce3cdaf9eaaad5c38cc2c56051785b84bd09 (diff) | |
Revert "added ifconfig-push and iroute options to openvpn::client"
This reverts commit 3a81ce3cdaf9eaaad5c38cc2c56051785b84bd09.
| -rw-r--r-- | manifests/client.pp | 8 | ||||
| -rw-r--r-- | spec/defines/openvpn_client_spec.rb | 5 | ||||
| -rw-r--r-- | templates/client.erb | 8 |
3 files changed, 0 insertions, 21 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index bfa316f..581eece 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -20,12 +20,6 @@ # Default: tun # Options: tun (routed connections), tap (bridged connections) # -# [*ifconfig_push*] -# String. Interface IP to be pushed to the client -# -# [*iroute*] -# String or Array. List of iroutes to be announced to the server -# # [*mute*] # Integer. Set log mute level # Default: 20 @@ -94,8 +88,6 @@ define openvpn::client( $server, $compression = 'comp-lzo', $dev = 'tun', - $ifconfig_push = '', - $iroute = '', $mute = '20', $mute_replay_warnings = true, $nobind = true, diff --git a/spec/defines/openvpn_client_spec.rb b/spec/defines/openvpn_client_spec.rb index 438b3ca..a4b580e 100644 --- a/spec/defines/openvpn_client_spec.rb +++ b/spec/defines/openvpn_client_spec.rb @@ -59,8 +59,6 @@ describe 'openvpn::client', :type => :define do 'server' => 'test_server', 'compression' => 'comp-something', 'dev' => 'tap', - 'ifconfig_push' => '10.10.9.1 255.255.255.0', - 'iroute' => [ '10.10.10.0 255.255.255.0', '10.10.11.0 255.255.255.0' ], 'mute' => 10, 'mute_replay_warnings' => false, 'nobind' => false, @@ -85,9 +83,6 @@ describe 'openvpn::client', :type => :define do it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^resolv-retry\s+2m$/)} it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^verb\s+1$/)} it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^mute\s+10$/)} - it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^iroute\s+10\.10\.10\.0\s+255\.255\.255\.0$/)} - it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^iroute\s+10\.10\.11\.0\s+255\.255\.255\.0$/)} - it { should contain_file('/etc/openvpn/test_server/download-configs/test_client/test_client.conf').with_content(/^ifconfig-push\s+10\.10\.9\.1\s+255\.255\.255\.0$/)} end end diff --git a/templates/client.erb b/templates/client.erb index d8b9213..021ed61 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -24,11 +24,3 @@ mute-replay-warnings ns-cert-type server verb <%= scope.lookupvar('verb') %> mute <%= scope.lookupvar('mute') %> -<% if scope.lookupvar('iroute') != '' -%> -<% scope.lookupvar('iroute').to_a.each do |route| -%> -iroute <%= route %> -<% end -%> -<% end -%> -<% if scope.lookupvar('ifconfig_push') != '' -%> -ifconfig-push <%= scope.lookupvar('ifconfig_push') %> -<% end -%>
\ No newline at end of file |