diff options
| -rw-r--r-- | files/shorewall.conf.Debian.squeeze | 3 | ||||
| -rw-r--r-- | manifests/init.pp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/files/shorewall.conf.Debian.squeeze b/files/shorewall.conf.Debian.squeeze index 5c57b04..a3b1577 100644 --- a/files/shorewall.conf.Debian.squeeze +++ b/files/shorewall.conf.Debian.squeeze @@ -121,7 +121,7 @@ CLAMPMSS=No ROUTE_FILTER=Yes DETECT_DNAT_IPADDRS=No -======= + MARK_IN_FORWARD_CHAIN=Yes CLAMPMSS=No @@ -129,7 +129,6 @@ CLAMPMSS=No ROUTE_FILTER=No DETECT_DNAT_IPADDRS=YES ->>>>>>> immerda/master MUTEX_TIMEOUT=60 diff --git a/manifests/init.pp b/manifests/init.pp index 574ac85..656f5a1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,7 +16,7 @@ class shorewall( } } default: { - notice "unknown operatingsystem: $operatingsystem" + notice "unknown operatingsystem: ${::operatingsystem}" include shorewall::base } } |