From c2d57624c15dfaff038f9991f04ade46b5ad1d40 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Wed, 21 Nov 2012 17:45:44 +0100
Subject: move site_config::eip to site_openvpn (Feature #943)

---
 puppet/modules/site_shorewall/manifests/dnat_rule.pp | 4 ++--
 puppet/modules/site_shorewall/manifests/eip.pp       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'puppet/modules/site_shorewall')

diff --git a/puppet/modules/site_shorewall/manifests/dnat_rule.pp b/puppet/modules/site_shorewall/manifests/dnat_rule.pp
index 4fc62f85..68f480d8 100644
--- a/puppet/modules/site_shorewall/manifests/dnat_rule.pp
+++ b/puppet/modules/site_shorewall/manifests/dnat_rule.pp
@@ -6,7 +6,7 @@ define site_shorewall::dnat_rule {
         "dnat_tcp_port_$port":
           action          => 'DNAT',
           source          => 'net',
-          destination     => "\$FW:${site_config::eip::openvpn_gateway_address}:1194",
+          destination     => "\$FW:${site_openvpn::openvpn_gateway_address}:1194",
           proto           => 'tcp',
           destinationport => $port,
           order           => 100;
@@ -16,7 +16,7 @@ define site_shorewall::dnat_rule {
         "dnat_udp_port_$port":
           action          => 'DNAT',
           source          => 'net',
-          destination     => "\$FW:${site_config::eip::openvpn_gateway_address}:1194",
+          destination     => "\$FW:${site_openvpn::openvpn_gateway_address}:1194",
           proto           => 'udp',
           destinationport => $port,
           order           => 100;
diff --git a/puppet/modules/site_shorewall/manifests/eip.pp b/puppet/modules/site_shorewall/manifests/eip.pp
index 086bf75a..57dc17e9 100644
--- a/puppet/modules/site_shorewall/manifests/eip.pp
+++ b/puppet/modules/site_shorewall/manifests/eip.pp
@@ -10,7 +10,7 @@ class site_shorewall::eip {
   $ssh_port       = $ssh_config['port']
   $openvpn_config = hiera('openvpn')
   $openvpn_ports  = $openvpn_config['ports']
-  $openvpn_gateway_address = $site_config::eip::openvpn_gateway_address
+  $openvpn_gateway_address = $site_openvpn::openvpn_gateway_address
 
   # define macro for incoming services
   file { '/etc/shorewall/macro.leap_eip':
@@ -42,11 +42,11 @@ PARAM   -       -       udp     1194
 
   shorewall::masq { "${interface}_tcp":
     interface => $interface,
-    source    => "$site_config::eip::openvpn_tcp_network_prefix.0/$site_config::eip::openvpn_tcp_cidr"; }
+    source    => "$site_openvpn::openvpn_tcp_network_prefix.0/$site_openvpn::openvpn_tcp_cidr"; }
 
   shorewall::masq { "${interface}_udp":
     interface => $interface,
-    source    => "$site_config::eip::openvpn_udp_network_prefix.0/$site_config::eip::openvpn_udp_cidr"; }
+    source    => "$site_openvpn::openvpn_udp_network_prefix.0/$site_openvpn::openvpn_udp_cidr"; }
 
   shorewall::policy {
     'eip-to-all':
-- 
cgit v1.2.3