From f47bff9d61788f7422f2d0295caec252f30b41d7 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 24 Jan 2011 14:14:10 +0100 Subject: [PATCH] Open rsyncd port in ferm based on existance of /etc/rsyncd.conf. No longer list half our nodes by name --- manifests/site.pp | 3 +++ modules/ferm/manifests/per-host.pp | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index dd047efe0..b0d412981 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -100,6 +100,9 @@ node default { Linux: { include ferm include ferm::per-host + case $rsyncd { + "true": { include ferm::rsync } + } } } diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 79fe09781..138035825 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -5,12 +5,6 @@ class ferm::per-host { } } - case $hostname { - chopin,franck,gluck,kaufmann,kassia,klecker,lobos,merikanto,merkel,morricone,ravel,ries,rietz,saens,schein,senfl,stabile,steffani,valente,villa,wieck,wolkenstein: { - include ferm::rsync - } - } - case $hostname { chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,ries,rietz,saens,schein,steffani,valente,villa,wieck,stabile: { include ferm::ftp @@ -62,10 +56,6 @@ class ferm::per-host { description => "Allow powell to seed BT", rule => "proto tcp dport 8000:8100 jump ACCEPT" } - @ferm::rule { "dsa-powell-rsync": - description => "Hoster wants to sync from here, and why not", - rule => "&SERVICE_RANGE(tcp, rsync, ( 195.20.242.90 192.25.206.33 82.195.75.106 206.12.19.118 ))" - } } heininen,lotti: { @ferm::rule { "dsa-syslog": -- 2.20.1