Rollback git rules

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index 6da94f5413b8770802757fd64a3df162816cb542..269d645def4709050550b8c3eb287aabc529a9a2 100644 (file)
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -445,16 +445,27 @@ class firewall::router::puppetmaster($destination, $puppetmaster_port = '8140',
   }
 }
 
-class firewall::router::gitd($destination, $zone = 'vm') {
-  shorewall::rule { 'git-daemon':
+class firewall::router::gitd($destination, $zone = 'fw') {
+  shorewall::rule { 'git-daemon-1':
     action          => 'DNAT',
-    source          => 'all',
+    source          => 'net',
     destination     => "$zone:$destination:9418",
     proto           => 'tcp',
     destinationport => '9418',
     ratelimit       => '-',
     order           => '800',
   }
+
+  shorewall::rule { 'git-daemon-2':
+    action          => 'DNAT',
+    source          => '$FW',
+    destination     => "$zone:$destination:9418",
+    proto           => 'tcp',
+    destinationport => '9418',
+    originaldest    => "$ipaddress",
+    ratelimit       => '-',
+    order           => '801',
+  }
 }
 
 class firewall::router::icecast($destination, $zone = 'vm') {