projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Redirect www.d.o/support/ to /support since base-files used the wrong one.
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
security_mirror.pp
diff --git
a/modules/roles/manifests/security_mirror.pp
b/modules/roles/manifests/security_mirror.pp
index
2b1baf6
..
ac66599
100644
(file)
--- a/
modules/roles/manifests/security_mirror.pp
+++ b/
modules/roles/manifests/security_mirror.pp
@@
-1,32
+1,21
@@
class roles::security_mirror {
class roles::security_mirror {
+ include apache2::cache
apache2::site { '010-security.debian.org':
site => 'security.debian.org',
apache2::site { '010-security.debian.org':
site => 'security.debian.org',
- con
fig => 'puppet:///modules/roles/security_mirror/security.debian.org'
+ con
tent => template('roles/security_mirror/security.debian.org.erb')
}
}
- $bind = $::hostname ? {
- default => '',
- }
-
- $bind6 = $::hostname ? {
- default => '',
- }
-
- $logfile = '/var/log/ftp/vsftpd-security.debian.org.log'
-
+ include ferm::ftp_conntrack
vsftpd::site { 'security':
vsftpd::site { 'security':
- source => template('roles/security_mirror/vsftpd.conf.erb'),
- logfile => $logfile,
- bind => $bind,
+ banner => 'security.debian.org FTP server (vsftpd)',
+ logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
+ max_clients => 200,
+ root => '/srv/ftp.root/',
}
}
- if $bind6 {
- vsftpd::site { 'security-v6':
- source => template('roles/security_mirror/vsftpd.conf.erb'),
- logfile => $logfile,
- bind => $bind6,
- }
+ rsync::site { 'security':
+ source => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+ max_clients => 100,
}
}
-
}
}