X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=ec082c385b0eb440b6338caee28317ce6dcc2d85;hb=483f9c11e2419da2aa3fe83f306a2adf5f6938ef;hp=a4ab0d943d33c5620855c4555d485463db370742;hpb=a97eb9eec4e89516f8958ad948adbc755f13aba0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index a4ab0d943..ec082c385 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -111,7 +111,7 @@ class ferm::per-host {
 	cilea: {
             file {
                 "/etc/ferm/conf.d/load_sip_conntrack.conf":
-                    source => "puppet:///ferm/conntrack_sip.conf",
+                    source => "puppet:///modules/ferm/conntrack_sip.conf",
                     require => Package["ferm"],
                     notify  => Exec["ferm restart"];
             }
@@ -200,12 +200,22 @@ class ferm::per-host {
     case $hostname {
         sibelius: {
             @ferm::rule { "dsa-snapshot-varnish":
-                rule            => '&SERVICE(tcp, 11371)'
+                rule            => '&SERVICE(tcp, 6081)',
             }
+            @ferm::rule { "dsa-nat-snapshot-varnish":
+                table           => 'nat',
+                chain           => 'PREROUTING',
+                rule            => 'proto tcp daddr 193.62.202.28 dport 80 REDIRECT to-ports 6081',
+            }
+        }
+        stabile: {
             @ferm::rule { "dsa-snapshot-varnish":
-                table           => 'nat'
-                chain           => 'PREROUTING'
-                rule            => 'proto tcp daddr 193.62.202.28 dport 80 REDIRECT to-ports 6081'
+                rule            => '&SERVICE(tcp, 6081)',
+            }
+            @ferm::rule { "dsa-nat-snapshot-varnish":
+                table           => 'nat',
+                chain           => 'PREROUTING',
+                rule            => 'proto tcp daddr 206.12.19.150 dport 80 REDIRECT to-ports 6081',
             }
         }
     }