Rename rsync::site_systemd to rsync::site

[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 a96dbec..6349f3f 100644 (file)
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,11 +1,11 @@
 class roles::security_master {
-
        ssl::service { 'security-master.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
+               notify   => Exec['service apache2 reload'],
+               key      => true,
+               tlsaport => [443, 1873],
        }
 
-       vsftpd::site { 'security':
+       vsftpd::site_systemd { 'security':
                banner     => 'security-master.debian.org FTP server (vsftpd)',
                logfile    => '/var/log/ftp/vsftpd-security-master.debian.org.log',
                writable   => true,
@@ -14,8 +14,8 @@ class roles::security_master {
        }
 
        rsync::site { 'security_master':
-               source        => 'puppet:///modules/roles/security_master/rsyncd.conf',
+               source      => 'puppet:///modules/roles/security_master/rsyncd.conf',
                max_clients => 100,
-               sslname => "security-master.debian.org",
+               sslname     => 'security-master.debian.org',
        }
 }