rautavaara nfs and router for mgmt net

diff --git a/manifests/site.pp b/manifests/site.pp
index ace4f63b3a37b8a98733a6b43de1d17915c276ff..5f31bc52c0c0b82b13e7779c14261dde5dba56c4 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -99,7 +99,7 @@ node default {
                include dacs
        }
 
-       if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] {
+       if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo,rautavaara] {
                include nfs-server
        }
 

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 85151cca085ca31f5e331643e0e7d092f8400881..3fe2d09ce29bf568694a44d2a421e6cb81ee0b75 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -223,28 +223,20 @@ REJECT reject-with icmp-admin-prohibited
        }
 
        if $::hostname in [rautavaara] {
-               @ferm::rule { 'dsa-to-kfreebsd':
-                       description     => 'Traffic routed to kfreebsd hosts',
-                       chain           => 'to-kfreebsd',
-                       rule            => 'proto icmp ACCEPT;
-source ($FREEBSD_SSH_ACCESS $HOST_NAGIOS_V4) proto tcp dport 22 ACCEPT;
-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
-'
+               @ferm::rule { 'dsa-from-mgmt':
+                       description     => 'Traffic routed from mgmt net vlan/bridge',
+                       chain           => 'from-mgmt',
+                       rule            => 'interface eth1 ACCEPT'
                }
-               @ferm::rule { 'dsa-from-kfreebsd':
-                       description     => 'Traffic routed from kfreebsd vlan/bridge',
-                       chain           => 'from-kfreebsd',
-                       rule            => 'proto icmp ACCEPT;
-proto tcp dport (21 22 80 53 443) ACCEPT;
-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.99 206.12.19.121) ACCEPT; # loghost
-proto tcp dport 11371 daddr 82.195.75.107 ACCEPT; # keyring host
-proto tcp dport (25 submission) daddr ($HOST_MAILRELAY_V4) ACCEPT
-'
+               @ferm::rule { 'dsa-mgmt-mark':
+                       table           => 'mangle',
+                       chain           => 'PREROUTING',
+                       rule            => 'interface eth1 MARK set-mark 1',
+               }
+               @ferm::rule { 'dsa-mgmt-nat':
+                       table           => 'nat',
+                       chain           => 'POSTROUTING',
+                       rule            => 'outerface eth1 mod mark mark 1 MASQUERADE',
                }
        }