X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=45d14d47425a8851b1f0cdf83278995c35702a7b;hb=0c0363517fc6df92e8ae7956151cb38064745d90;hp=8ce448ec5abcf27bd1cac5bc6069dbffca2ed4e4;hpb=4e2186720c0ae90c5032b68e1f8f7bccfe3ac908;p=dsa-puppet.git diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp index 8ce448ec..45d14d47 100644 --- a/modules/ferm/manifests/init.pp +++ b/modules/ferm/manifests/init.pp @@ -17,9 +17,10 @@ class ferm { package { ferm: ensure => installed; ulogd: ensure => installed; + logrotate: ensure => installed; } - file { + file { "/etc/ferm/dsa.d": ensure => directory, purge => true, @@ -54,6 +55,10 @@ class ferm { require => Package["ferm"], mode => 0400, notify => Exec["ferm restart"]; + "/etc/logrotate.d/ulogd": + source => "puppet:///ferm/logrotate-ulogd", + require => Package["logrotate"], + ; } $munin_ips = split(regsubst($v4ips, '([^,]+)', 'ip_\1', 'G'), ',') @@ -62,6 +67,17 @@ class ferm { $munin_ips: script => "ip_"; } + case extractnodeinfo($nodeinfo, 'buildd') { + 'true': { + file { + "/etc/ferm/conf.d/load_ftp_conntrack.conf": + source => "puppet:///ferm/conntrack_ftp.conf", + require => Package["ferm"], + notify => Exec["ferm restart"]; + } + } + } + case $v6ips { 'no': {} default: {