X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=7ade513118c52703e4fb79896b7cc11950710437;hb=2bbf27af83a6bd01536e611eee09d7e5023b2305;hp=d67f8fb65e74dcec106ebb0e845d6cc6f4074438;hpb=5f9b6e60800eeff29318662b84404dc0d23283dc;p=mirror%2Fdsa-puppet.git diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp index d67f8fb65..7ade51311 100644 --- a/modules/ferm/manifests/init.pp +++ b/modules/ferm/manifests/init.pp @@ -1,5 +1,5 @@ class ferm { - define rule($domain="ip", $table="filter", $chain="INPUT", $rule, $description="", $prio="00") { + define rule($domain="ip", $table="filter", $chain="INPUT", $rule, $description="", $prio="00", $notarule=false) { file { "/etc/ferm/dsa.d/${prio}_${name}": ensure => present, @@ -26,6 +26,7 @@ class ferm { force => true, recurse => true, source => "puppet:///files/empty/", + notify => Exec["ferm restart"], require => Package["ferm"]; "/etc/ferm": ensure => directory, @@ -70,7 +71,7 @@ class ferm { } case extractnodeinfo($nodeinfo, 'buildd') { - 'true': { + true: { file { "/etc/ferm/conf.d/load_ftp_conntrack.conf": source => "puppet:///modules/ferm/conntrack_ftp.conf",