summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/modules/site_config/manifests/eip.pp16
-rw-r--r--puppet/modules/site_openvpn/manifests/server_config.pp16
2 files changed, 22 insertions, 10 deletions
diff --git a/puppet/modules/site_config/manifests/eip.pp b/puppet/modules/site_config/manifests/eip.pp
index 6e866b1c..e6f80d25 100644
--- a/puppet/modules/site_config/manifests/eip.pp
+++ b/puppet/modules/site_config/manifests/eip.pp
@@ -7,13 +7,19 @@ class site_config::eip {
#$openvpn_configs=hiera('openvpn_server_configs')
#create_resources('site_openvpn::server_config', $openvpn_configs)
-
+
site_openvpn::server_config { 'tcp_config':
- port => '1194',
- proto => 'tcp'
+ port => '1194',
+ proto => 'tcp',
+ local => $::ipaddress_eth0_1,
+ server => '10.42.0.0 255.255.248.0',
+ push => '"dhcp-option DNS 10.42.0.1"',
}
site_openvpn::server_config { 'udp_config':
- port => '1194',
- proto => 'udp'
+ port => '1194',
+ proto => 'udp',
+ local => $::ipaddress_eth0_1,
+ server => '10.43.0.0 255.255.248.0',
+ push => '"dhcp-option DNS 10.43.0.1"',
}
}
diff --git a/puppet/modules/site_openvpn/manifests/server_config.pp b/puppet/modules/site_openvpn/manifests/server_config.pp
index 320a4add..784152b7 100644
--- a/puppet/modules/site_openvpn/manifests/server_config.pp
+++ b/puppet/modules/site_openvpn/manifests/server_config.pp
@@ -1,6 +1,8 @@
-define site_openvpn::server_config($port, $proto) {
+define site_openvpn::server_config ($port, $proto, $local, $server, $push ) {
+
$openvpn_configname = $name
+
#notice("Creating OpenVPN $openvpn_configname:
# Port: $port, Protocol: $proto")
@@ -45,7 +47,7 @@ define site_openvpn::server_config($port, $proto) {
server => $openvpn_configname;
"local $openvpn_configname":
key => 'local',
- value => $::ipaddress,
+ value => $local,
server => $openvpn_configname;
"mute $openvpn_configname":
key => 'mute',
@@ -62,9 +64,13 @@ define site_openvpn::server_config($port, $proto) {
key => 'proto',
value => $proto,
server => $openvpn_configname;
- "push $openvpn_configname":
+ "push1 $openvpn_configname":
+ key => 'push',
+ value => $push,
+ server => $openvpn_configname;
+ "push2 $openvpn_configname":
key => 'push',
- value => "\"redirect-gateway def1\"",
+ value => '"redirect-gateway def1"',
server => $openvpn_configname;
"script-security $openvpn_configname":
key => 'script-security',
@@ -72,7 +78,7 @@ define site_openvpn::server_config($port, $proto) {
server => $openvpn_configname;
"server $openvpn_configname":
key => 'server',
- value => "10.42.0.0 255.255.248.0",
+ value => "$server",
server => $openvpn_configname;
"status $openvpn_configname":
key => 'status',