projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
godard: enable persistent journald storage. rt#7049
[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
ae3c471
..
a7f8516
100644
(file)
--- a/
modules/roles/manifests/security_master.pp
+++ b/
modules/roles/manifests/security_master.pp
@@
-1,21
+1,19
@@
class roles::security_master {
class roles::security_master {
-
ssl::service { 'security-master.debian.org':
ssl::service { 'security-master.debian.org':
- notify => Service['apache2'],
- key => true,
+ notify => Exec['service apache2 reload'],
+ key => true,
+ tlsaport => [443, 1873],
}
vsftpd::site { 'security':
}
vsftpd::site { 'security':
- 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/',
+ ensure => absent,
+ root => '/nonexistent',
}
rsync::site { 'security_master':
}
rsync::site { 'security_master':
- source => 'puppet:///modules/roles/security_master/rsyncd.conf',
- max_clients => 100,
- sslname => "security-master.debian.org",
+ source => 'puppet:///modules/roles/security_master/rsyncd.conf',
+ # Needs to be at least twice the number of direct mirrors (currently 15) plus some spare
+ max_clients => 50,
+ sslname => 'security-master.debian.org',
}
}
}
}