From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 12 Sep 2010 20:57:11 +0000 (+0200)
Subject: Try to appease anal ferm
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1dcf5f16cffabb2e3e6c6ea8202beafe25330313;p=mirror%2Fdsa-puppet.git

Try to appease anal ferm
---

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index f00dc4f33..5e193caa2 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -136,7 +136,7 @@ class ferm::per-host {
                                 source ($HOST_MAILRELAY_V4 $HOST_NAGIOS_V4) proto tcp dport 25 ACCEPT;
                                 source ($HOST_MUNIN_V4 $HOST_NAGIOS_V4) proto tcp dport 4949 ACCEPT;
                                 source ($HOST_NAGIOS_V4) proto tcp dport 5666 ACCEPT;
-                                source ($HOST_NAGIOS_V4) proto udp dport ntp ACCEPT;
+                                source ($HOST_NAGIOS_V4) proto udp dport ntp ACCEPT
                                '
         }
         @ferm::rule { "dsa-from-kfreebsd":
@@ -147,7 +147,7 @@ class ferm::per-host {
                                 proto udp dport (53 123) ACCEPT;
                                 proto tcp dport 8140 daddr 82.195.75.104 ACCEPT; # puppethost
                                 proto tcp dport 5140 daddr 82.195.75.98 ACCEPT; # loghost
-                                proto tcp dport (25 submission) daddr ($HOST_MAILRELAY_V4) ACCEPT;
+                                proto tcp dport (25 submission) daddr ($HOST_MAILRELAY_V4) ACCEPT
                                '
         }
     }}
@@ -166,7 +166,7 @@ class ferm::per-host {
                                     interface vlan11 outerface eth0 jump from-kfreebsd;
                                     interface eth0 destination ($FREEBSD_HOSTS) jump to-kfreebsd;
                                     ULOG ulog-prefix "REJECT FORWARD: ";
-                                    REJECT reject-with icmp-admin-prohibited;
+                                    REJECT reject-with icmp-admin-prohibited
                                     '
             }
         }
@@ -186,7 +186,7 @@ class ferm::per-host {
                                     interface br2 outerface br0 jump from-kfreebsd;
                                     interface br0 destination ($FREEBSD_HOSTS) jump to-kfreebsd;
                                     ULOG ulog-prefix "REJECT FORWARD: ";
-                                    REJECT reject-with icmp-admin-prohibited;
+                                    REJECT reject-with icmp-admin-prohibited
                                     '
             }
         }