diff options
author | Justin Lambert <jlambert@eml.cc> | 2013-01-11 06:27:02 -0700 |
---|---|---|
committer | Justin Lambert <jlambert@eml.cc> | 2013-01-11 06:27:02 -0700 |
commit | 48bbd0cd422d57b4f6278d3b64e53aaf5de787cf (patch) | |
tree | b39c150b603acbd33ddeca4407b7f17c5c32915e /manifests | |
parent | 5df60aad95fcff99ef5837577b0a70435e99d1aa (diff) |
removed /etc/defalut/openvpn from all but Debian based machines, defaults cleanup on openvpn::server
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/config.pp | 26 | ||||
-rw-r--r-- | manifests/server.pp | 17 |
2 files changed, 24 insertions, 19 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index 9e7753d..a316cc9 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -16,18 +16,20 @@ class openvpn::config { include concat::setup - concat { - '/etc/default/openvpn': - owner => root, - group => root, - mode => 644, - warn => true; - } + if $::osfamily == 'Debian' { + concat { + '/etc/default/openvpn': + owner => root, + group => root, + mode => 644, + warn => true; + } - concat::fragment { - 'openvpn.default.header': - content => template('openvpn/etc-default-openvpn.erb'), - target => '/etc/default/openvpn', - order => 01; + concat::fragment { + 'openvpn.default.header': + content => template('openvpn/etc-default-openvpn.erb'), + target => '/etc/default/openvpn', + order => 01; + } } }
\ No newline at end of file diff --git a/manifests/server.pp b/manifests/server.pp index 20dceed..53085f5 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -46,7 +46,8 @@ # # [*logfile*] # String. Logfile for this openvpn server -# Default: "${name}/openvpn.log" +# Default: '' +# Options: '' (syslog) or log file name # # [*port*] # Integer. The port the openvpn server service is running on @@ -67,7 +68,7 @@ # # [*server*] # String. Network to assign client addresses out of -# Default: $::network_eth0 $::netmask_eth0 +# Default: None. Required in tun mode, not in tap mode # # [*push*] # Array. Options to push out to the client. This can include routes, DNS @@ -109,7 +110,7 @@ define openvpn::server( $proto = 'tcp', $status_log = "${name}/openvpn-status.log", $user = 'nobody', - $server = "${::network_eth0} ${::netmask_eth0}", + $server = '', $push = [] ) { @@ -195,11 +196,13 @@ define openvpn::server( require => Exec["copy easy-rsa to openvpn config folder ${name}"]; } - concat::fragment { + if $::osfamily == 'Debian' { + concat::fragment { "openvpn.default.autostart.${name}": - content => "AUTOSTART=\"\$AUTOSTART ${name}\"\n", - target => '/etc/default/openvpn', - order => 10; + content => "AUTOSTART=\"\$AUTOSTART ${name}\"\n", + target => '/etc/default/openvpn', + order => 10; + } } file { |