1 files changed, 14 insertions, 2 deletions
diff --git a/manifests/virtual/gobby.pp b/manifests/virtual/gobby.pp
index 5554a11..162fe1d 100644
--- a/manifests/virtual/gobby.pp
+++ b/manifests/virtual/gobby.pp
@@ -1,10 +1,22 @@
-class firewall::virtual::gobby($destination, $zone = 'fw') {
+class firewall::virtual::gobby($destination) {
   shorewall::rule { 'gobby-0':
     action          => 'DNAT',
+    source          => 'vm',
+    destination     => "fw:$destination:6523",
+    proto           => 'tcp',
+    destinationport => '6523',
+    originaldest    => hiera('firewall::external_ip', $::ipaddress),
+    ratelimit       => '-',
+    order           => 2400,
+  }
+
+  shorewall::rule { 'gobby-1':
+    action          => 'DNAT',
     source          => 'net',
-    destination     => "$zone:$destination:6523",
+    destination     => "vm:$destination:6523",
     proto           => 'tcp',
     destinationport => '6523',
+    originaldest    => hiera('firewall::external_ip', $::ipaddress),
     ratelimit       => '-',
     order           => 2400,
   }