From 40a9f5b6d556615ad95085b51ec56585dfbe248d Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 9 Jun 2016 17:52:57 -0300
Subject: Updates some firewall::virtual rules to new kvm scheme

---
 manifests/virtual/gitd.pp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'manifests/virtual/gitd.pp')

diff --git a/manifests/virtual/gitd.pp b/manifests/virtual/gitd.pp
index 23095aa..02c4fb9 100644
--- a/manifests/virtual/gitd.pp
+++ b/manifests/virtual/gitd.pp
@@ -1,18 +1,19 @@
-class firewall::virtual::gitd($destination, $zone = 'fw') {
+class firewall::virtual::gitd($destination) {
   shorewall::rule { 'git-daemon-1':
     action          => 'DNAT',
     source          => 'net',
-    destination     => "$zone:$destination:9418",
+    destination     => "vm:$destination:9418",
     proto           => 'tcp',
     destinationport => '9418',
+    originaldest    => hiera('firewall::external_ip', $::ipaddress),
     ratelimit       => '-',
     order           => 800,
   }
 
   shorewall::rule { 'git-daemon-2':
     action          => 'DNAT',
-    source          => '$FW',
-    destination     => "$zone:$destination:9418",
+    source          => 'vm',
+    destination     => "fw:$destination:9418",
     proto           => 'tcp',
     destinationport => '9418',
     originaldest    => hiera('firewall::external_ip', $::ipaddress),
-- 
cgit v1.2.3