summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/manifests/site.pp86
1 files changed, 7 insertions, 79 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 0d1f426d..1bfc730e 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,82 +1,10 @@
node 'default' {
- notify {'Please specify a host in site.pp!':}
-
- $openvpn_server=$::fqdn
-
- openvpn::server {
- "$openvpn_server":
- country => hiera("country"),
- province => hiera("province"),
- city => hiera("city"),
- organization => hiera("organization"),
- email => hiera("email");
- }
-
-# configure server
-
-
- openvpn::option {
- "dev $openvpn_server":
- key => "dev",
- value => "tun0",
- server => "$openvpn_server";
- "script-security $openvpn_server":
- key => "script-security",
- value => "3",
- server => "$openvpn_server";
- "daemon $openvpn_server":
- key => "daemon",
- server => "$openvpn_server";
- "keepalive $openvpn_server":
- key => "keepalive",
- value => "10 60",
- server => "$openvpn_server";
- "ping-timer-rem $openvpn_server":
- key => "ping-timer-rem",
- server => "$openvpn_server";
- "persist-tun $openvpn_server":
- key => "persist-tun",
- server => "$openvpn_server";
- "persist-key $openvpn_server":
- key => "persist-key",
- server => "$openvpn_server";
- "proto $openvpn_server":
- key => "proto",
- value => "tcp-server",
- server => "$openvpn_server";
- "cipher $openvpn_server":
- key => "cipher",
- value => "BF-CBC",
- server => "$openvpn_server";
- "local $openvpn_server":
- key => "local",
- value => $ipaddress,
- server => "$openvpn_server";
- "tls-server $openvpn_server":
- key => "tls-server",
- server => "$openvpn_server";
- "server $openvpn_server":
- key => "server",
- value => "10.10.10.0 255.255.255.0",
- server => "$openvpn_server";
- "lport $openvpn_server":
- key => "lport",
- value => "1194",
- server => "$openvpn_server";
- "management $openvpn_server":
- key => "management",
- value => "/var/run/openvpn-$openvpn_server.sock unix",
- server => "$openvpn_server";
- "comp-lzo $openvpn_server":
- key => "comp-lzo",
- server => "$openvpn_server";
- "topology $openvpn_server":
- key => "topology",
- value => "subnet",
- server => "$openvpn_server";
- "client-to-client $openvpn_server":
- key => "client-to-client",
- server => "$openvpn_server";
- }
+ $service='eip'
+ $password=hiera('testpw')
+ $openvpn_ports=hiera_array('openvpn_ports')
+ $tor=hiera('tor')
+ notify {"Password: $password":}
+ notify {"Openvpn Config for $fqdn: openvpn_ports=$openvpn_ports, tor=$tor":}
+ #include site_openvpn
}