X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=25af73c98a597db741d29216545d22b82afe9353;hb=1597cabb3f8e6722fa1d8fb4ac800b7e2c6ccf4c;hp=3e818074b8a3dfe40b24e1cf7a00e44b16a01ca3;hpb=d6d82456f161ec0816d971dd5f6722c1b12fb7e9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 3e818074b..25af73c98 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -36,23 +36,19 @@ class roles::security_mirror {
 		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	if has_role('security_mirror_no_ftp') {
-		vsftpd::site_systemd { 'security':
-			ensure => absent,
-			root   => '/nonexistent',
-		}
-	} else {
-		include ferm::ftp_conntrack
-		vsftpd::site_systemd { 'security':
-			banner       => 'security.debian.org FTP server (vsftpd)',
-			logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
-			max_clients  => 200,
-			root         => '/srv/ftp.root/',
-			binds        => $binds,
-		}
+        roles::mirror_health { 'security':
+		check_hosts   => hiera('roles.security_mirror'),
+		check_service => 'security',
+		url           => 'http://security.backend.mirrors.debian.org/debian/dists/sid/Release',
+		health_url    => 'http://security.backend.mirrors.debian.org/_health',
+        }
+
+	vsftpd::site { 'security':
+		ensure => absent,
+		root   => '/nonexistent',
 	}
 
-	rsync::site_systemd { 'security':
+	rsync::site { 'security':
 		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
 		max_clients => 100,
 		binds       => $binds,