projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of buildd-{lenny,squeeze,wheezy} shares on security-master rsync
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
security_master.pp
diff --git
a/modules/roles/manifests/security_master.pp
b/modules/roles/manifests/security_master.pp
index
6992537
..
7192775
100644
(file)
--- a/
modules/roles/manifests/security_master.pp
+++ b/
modules/roles/manifests/security_master.pp
@@
-1,26
+1,19
@@
class roles::security_master {
class roles::security_master {
- $bind = $::hostname ? {
-
default => ''
,
+ ssl::service { 'security-master.debian.org':
+
notify => Service['apache2']
,
}
}
- $bind6 = $::hostname ? {
- default => '',
- }
-
- $logfile = '/var/log/ftp/vsftpd-security-master.debian.org.log'
-
vsftpd::site { 'security':
vsftpd::site { 'security':
- content => template('roles/security_master/vsftpd.conf.erb'),
- logfile => $logfile,
- bind => $bind,
+ banner => 'security-master.debian.org FTP server (vsftpd)',
+ logfile => '/var/log/ftp/vsftpd-security-master.debian.org.log',
+ writable => true,
+ chown_user => dak-unpriv,
+ root => '/srv/ftp.root/',
}
}
- if $bind6 {
- vsftpd::site { 'security-v6':
- content => template('roles/security_master/vsftpd.conf.erb'),
- logfile => $logfile,
- bind => $bind6,
- }
+ rsync::site { 'security_master':
+ source => 'puppet:///modules/roles/security_master/rsyncd.conf',
+ max_clients => 100,
}
}
}
}