projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'waldi/rsync-systemd-master'
[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
036f059
..
35fb510
100644
(file)
--- a/
modules/roles/manifests/security_master.pp
+++ b/
modules/roles/manifests/security_master.pp
@@
-1,15
+1,21
@@
class roles::security_master {
class roles::security_master {
+ ssl::service { 'security-master.debian.org':
+ notify => Exec['service apache2 reload'],
+ key => true,
+ tlsaport => [443, 1873],
+ }
vsftpd::site { 'security':
banner => 'security-master.debian.org FTP server (vsftpd)',
logfile => '/var/log/ftp/vsftpd-security-master.debian.org.log',
writable => true,
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,
+ chown_user => dak
-unpriv
,
root => '/srv/ftp.root/',
}
root => '/srv/ftp.root/',
}
- rsync::site { 'security_master':
- source
=> 'puppet:///modules/roles/security_master/rsyncd.conf',
+ rsync::site
_systemd
{ 'security_master':
+ source => 'puppet:///modules/roles/security_master/rsyncd.conf',
max_clients => 100,
max_clients => 100,
+ sslname => 'security-master.debian.org',
}
}
}
}