summaryrefslogtreecommitdiff
path: root/puppet/modules/site_openvpn
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-10-30 12:37:47 +0100
committervarac <varacanero@zeromail.org>2012-10-30 12:37:47 +0100
commit38bb67fa4238dda60e1a140f38f4450a4f8a8ca9 (patch)
tree024ba24cb0ff118eb16c1e79d6c17a9c6b15d6b5 /puppet/modules/site_openvpn
parent76bbc01eae893206a8ed0d8d248ee565e3acdc61 (diff)
parent038380e042289a9586141d7154febea2a2a6a56c (diff)
Merge branch 'feature/interfaces' into develop
Diffstat (limited to 'puppet/modules/site_openvpn')
-rw-r--r--puppet/modules/site_openvpn/manifests/server_config.pp13
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',