diff options
| author | varac <varacanero@zeromail.org> | 2012-10-30 15:03:55 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-10-30 15:03:55 +0100 |
| commit | f066f7a99a8d15f5b80c5bbf9117606c723ab352 (patch) | |
| tree | 961439bb37e8fa8442759987c0dcad0369145ed7 /puppet/modules/site_openvpn/manifests | |
| parent | 06a1546a36698dd75fb500ad2a12e9bbf9b43f03 (diff) | |
| parent | 9586f6ec95b6bdba7ca3df4135055f2cced9e972 (diff) | |
Merge branch 'develop' into feature/couchdb
Diffstat (limited to 'puppet/modules/site_openvpn/manifests')
| -rw-r--r-- | puppet/modules/site_openvpn/manifests/server_config.pp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp index 441a21e3..482c6ab7 100644 --- a/puppet/modules/site_openvpn/manifests/server_config.pp +++ b/puppet/modules/site_openvpn/manifests/server_config.pp @@ -2,10 +2,6 @@ define site_openvpn::server_config ($port, $proto, $local, $server, $push, $mana $openvpn_configname = $name - - #notice("Creating OpenVPN $openvpn_configname: - # Port: $port, Protocol: $proto") - concat { "/etc/openvpn/$openvpn_configname.conf": owner => root, @@ -92,10 +88,11 @@ define site_openvpn::server_config ($port, $proto, $local, $server, $push, $mana key => 'topology', value => 'subnet', server => $openvpn_configname; - "up $openvpn_configname": - key => 'up', - value => '/etc/openvpn/server-up.sh', - server => $openvpn_configname; + # no need for server-up.sh right now + #"up $openvpn_configname": + # key => 'up', + # value => '/etc/openvpn/server-up.sh', + # server => $openvpn_configname; "verb $openvpn_configname": key => 'verb', value => '3', |