diff options
author | varac <varacanero@zeromail.org> | 2012-10-12 22:07:19 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2012-10-12 22:07:19 +0200 |
commit | 3e11ce4c43282448b032f9ad8e31667fb4b85ccb (patch) | |
tree | 3bc95d3d627d00fbf496b157ec3a3593821b1879 /puppet/modules/site_config/manifests/eip.pp | |
parent | b8f727635254453503bd1d9b22e20d69cc23630a (diff) | |
parent | 0eff2049fa8d846dffee3236824b8bc42e581467 (diff) |
Merge branch 'feature/eip' into develop
Diffstat (limited to 'puppet/modules/site_config/manifests/eip.pp')
-rw-r--r-- | puppet/modules/site_config/manifests/eip.pp | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/puppet/modules/site_config/manifests/eip.pp b/puppet/modules/site_config/manifests/eip.pp index 56eb1452..95f9dbf4 100644 --- a/puppet/modules/site_config/manifests/eip.pp +++ b/puppet/modules/site_config/manifests/eip.pp @@ -1,10 +1,29 @@ class site_config::eip { include site_openvpn + include site_openvpn::keys - $tor=hiera('tor') - notice("Tor enabled: $tor") + #$tor=hiera('tor') + #notice("Tor enabled: $tor") - $openvpn_configs=hiera('openvpn_server_configs') - create_resources('site_openvpn::server_config', $openvpn_configs) + #$openvpn_configs=hiera('openvpn_server_configs') + #create_resources('site_openvpn::server_config', $openvpn_configs) + + site_openvpn::server_config { 'tcp_config': + port => '1194', + proto => 'tcp', + local => $::ipaddress_eth0_1, + server => '10.1.0.0 255.255.248.0', + push => '"dhcp-option DNS 10.1.0.1"', + management => '127.0.0.1 1000' + } + site_openvpn::server_config { 'udp_config': + port => '1194', + proto => 'udp', + local => $::ipaddress_eth0_1, + server => '10.2.0.0 255.255.248.0', + push => '"dhcp-option DNS 10.2.0.1"', + management => '127.0.0.1 1001' + } + include site_shorewall::eip } |