X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=3f1b70cebd4dd8738999742b1de9f0c0c09d5513;hb=a84f32b02244c18130bc32f6b410367af2c07279;hp=6992537d773e62116a7874e3f6fdb778e3515c09;hpb=6f2b99d1b77cb7edefdeb8ed407139ef4c2bf447;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 6992537d7..3f1b70ceb 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,26 +1,10 @@
 class roles::security_master {
 
-	$bind = $::hostname ? {
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		default => '',
-	}
-
-	$logfile = '/var/log/ftp/vsftpd-security-master.debian.org.log'
-
 	vsftpd::site { 'security':
-		content => template('roles/security_master/vsftpd.conf.erb'),
-		logfile => $logfile,
-		bind    => $bind,
-	}
-
-	if $bind6 {
-		vsftpd::site { 'security-v6':
-			content => template('roles/security_master/vsftpd.conf.erb'),
-			logfile => $logfile,
-			bind    => $bind6,
-		}
+		banner     => 'security-master.debian.org FTP server (vsftpd)',
+		logfile    => '/var/log/ftp/vsftpd-security-master.debian.org.log',
+		writable   => true,
+		chown_user => dak,
+		root       => '/srv/ftp.root/',
 	}
 }