make this templates

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp
index 68ac31404766e734a418107d7874d787cc62c790..38a055a0d8f5c7be8848f02b99cb57dd937503f0 100644 (file)
--- a/modules/roles/manifests/backports_master.pp
+++ b/modules/roles/manifests/backports_master.pp
@@ -10,16 +10,18 @@ class roles::backports_master {
                default => '',
        }
 
+       $logfile = '/var/log/ftp/vsftpd-backports-master.debian.org.log'
+
        vsftpd::site { 'backports':
-               source  => 'puppet:///modules/roles/backports_master/vsftpd.conf',
-               logfile => '/var/log/ftp/vsftpd-backports-master.debian.org.log',
+               content => template('roles/backports_master/vsftpd.conf.erb'),
+               logfile => $logfile,
                bind    => $bind,
        }
 
        if $bind6 {
                vsftpd::site { 'backports-v6':
-                       source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-                       logfile => '/var/log/ftp/vsftpd-backports-master.debian.org.log',
+                       source  => template('roles/backports_mirror/vsftpd.conf.erb'),
+                       logfile => $logfile,
                        bind    => $bind6,
                }
        }

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 754b98edc41b3e23497c42ca8c9acc98f8b05f3e..6a03984737578d7ad0837f9c8d253c13839add37 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -12,16 +12,18 @@ class roles::ftp {
                default => '',
        }
 
+       $logfile = '/var/log/ftp/vsftpd-ftp.debian.org.log'
+
        vsftpd::site { 'ftp':
-               source  => 'puppet:///modules/roles/ftp/vsftpd.conf',
-               logfile => '/var/log/ftp/vsftpd-ftp.debian.org.log',
+               source  => template('roles/ftp/vsftpd.conf.erb'),
+               logfile => $logfile,
                bind    => $bind,
        }
 
        if $bind6 {
                vsftpd::site { 'ftp-v6':
-                       source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-                       logfile => '/var/log/ftp/vsftpd-ftp.debian.org.log',
+                       source  => template('roles/ftp/vsftpd.conf.erb'),
+                       logfile => $logfile,
                        bind    => $bind6,
                }
        }

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index abcc6bbd22082c62d9cea8c7f95ba1becf4d5d2b..807332f43ff19aa9252af4d6d9d6807ff1c40bb0 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -8,16 +8,18 @@ class roles::ftp_upload {
                default => '',
        }
 
+       $logfile = '/var/log/ftp/vsftpd-ftp.upload.debian.org.log'
+
        vsftpd::site { 'ftp-upload':
-               source  => 'puppet:///modules/roles/ftp_upload/vsftpd.conf',
-               logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+               source  => template('roles/ftp_upload/vsftpd.conf.erb'),
+               logfile => $logfile,
                bind    => $bind,
        }
 
        if $bind6 {
                vsftpd::site { 'ftp-upload-v6':
-                       source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-                       logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+                       source  => template('roles/ftp_upload/vsftpd.conf.erb'),
+                       logfile => $logfile,
                        bind    => $bind6,
                }
        }

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 5e3ee78fbfb0203c4518ef7b69fc4a8521f4bcbf..2b1baf6117fa0d45ee793e9d7188dfe551588339 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -13,16 +13,18 @@ class roles::security_mirror {
                default => '',
        }
 
+       $logfile = '/var/log/ftp/vsftpd-security.debian.org.log'
+
        vsftpd::site { 'security':
-               source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-               logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
+               source  => template('roles/security_mirror/vsftpd.conf.erb'),
+               logfile => $logfile,
                bind    => $bind,
        }
 
        if $bind6 {
                vsftpd::site { 'security-v6':
-                       source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-                       logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
+                       source  => template('roles/security_mirror/vsftpd.conf.erb'),
+                       logfile => $logfile,
                        bind    => $bind6,
                }
        }

diff --git a/modules/roles/templates/backports_master/vsftpd.conf b/modules/roles/templates/backports_master/vsftpd.conf
deleted file mode 100644 (file)
index 02979ed..0000000
--- a/modules/roles/templates/backports_master/vsftpd.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-anonymous_enable=YES
-write_enable=YES
-anon_root=/srv/backports-upload
-anon_umask=027
-anon_upload_enable=YES
-chown_uploads=YES
-chown_username=dak
-
-xferlog_enable=YES
-xferlog_file=<%= scope.lookupvar('logfile') %>
-
-ftpd_banner=backports-master.debian.org FTP server
-secure_chroot_dir=/var/run/vsftpd
-pam_service_name=vsftpd
-setproctitle_enable=YES
-dirmessage_enable=YES
-ls_recurse_enable=NO
-connect_from_port_20=NO
-max_clients=100

diff --git a/modules/roles/templates/backports_master/vsftpd.conf.erb b/modules/roles/templates/backports_master/vsftpd.conf.erb
new file mode 100644 (file)
index 0000000..02979ed
--- /dev/null
+++ b/modules/roles/templates/backports_master/vsftpd.conf.erb
@@ -0,0 +1,19 @@
+anonymous_enable=YES
+write_enable=YES
+anon_root=/srv/backports-upload
+anon_umask=027
+anon_upload_enable=YES
+chown_uploads=YES
+chown_username=dak
+
+xferlog_enable=YES
+xferlog_file=<%= scope.lookupvar('logfile') %>
+
+ftpd_banner=backports-master.debian.org FTP server
+secure_chroot_dir=/var/run/vsftpd
+pam_service_name=vsftpd
+setproctitle_enable=YES
+dirmessage_enable=YES
+ls_recurse_enable=NO
+connect_from_port_20=NO
+max_clients=100

diff --git a/modules/roles/templates/ftp/vsftpd.conf b/modules/roles/templates/ftp/vsftpd.conf
deleted file mode 100644 (file)
index 60ac366..0000000
--- a/modules/roles/templates/ftp/vsftpd.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-ftpd_banner=ftp.debian.org FTP server
-
-anonymous_enable=YES
-dirmessage_enable=YES
-connect_from_port_20=NO
-setproctitle_enable=YES
-ls_recurse_enable=NO
-xferlog_enable=YES
-xferlog_file=<%= scope.lookupvar('logfile') %>
-
-secure_chroot_dir=/var/run/vsftpd
-pam_service_name=vsftpd
-
-anon_root=/srv/ftp.debian.org/ftp.root
-

diff --git a/modules/roles/templates/ftp/vsftpd.conf.erb b/modules/roles/templates/ftp/vsftpd.conf.erb
new file mode 100644 (file)
index 0000000..60ac366
--- /dev/null
+++ b/modules/roles/templates/ftp/vsftpd.conf.erb
@@ -0,0 +1,15 @@
+ftpd_banner=ftp.debian.org FTP server
+
+anonymous_enable=YES
+dirmessage_enable=YES
+connect_from_port_20=NO
+setproctitle_enable=YES
+ls_recurse_enable=NO
+xferlog_enable=YES
+xferlog_file=<%= scope.lookupvar('logfile') %>
+
+secure_chroot_dir=/var/run/vsftpd
+pam_service_name=vsftpd
+
+anon_root=/srv/ftp.debian.org/ftp.root
+

diff --git a/modules/roles/templates/ftp_upload/vsftpd.conf b/modules/roles/templates/ftp_upload/vsftpd.conf
deleted file mode 100644 (file)
index 30612b0..0000000
--- a/modules/roles/templates/ftp_upload/vsftpd.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-ftpd_banner=ftp.upload.debian.org FTP server
-
-max_clients=100
-
-anonymous_enable=YES
-dirmessage_enable=YES
-connect_from_port_20=NO
-setproctitle_enable=YES
-ls_recurse_enable=NO
-xferlog_enable=YES
-
-secure_chroot_dir=/var/run/vsftpd
-xferlog_file=<%= scope.lookupvar('logfile') %>
-pam_service_name=vsftpd
-
-anon_root=/srv/upload.debian.org/ftp
-write_enable=YES
-anon_umask=027
-anon_upload_enable=YES
-chown_uploads=YES
-chown_username=dak
-

diff --git a/modules/roles/templates/ftp_upload/vsftpd.conf.erb b/modules/roles/templates/ftp_upload/vsftpd.conf.erb
new file mode 100644 (file)
index 0000000..30612b0
--- /dev/null
+++ b/modules/roles/templates/ftp_upload/vsftpd.conf.erb
@@ -0,0 +1,22 @@
+ftpd_banner=ftp.upload.debian.org FTP server
+
+max_clients=100
+
+anonymous_enable=YES
+dirmessage_enable=YES
+connect_from_port_20=NO
+setproctitle_enable=YES
+ls_recurse_enable=NO
+xferlog_enable=YES
+
+secure_chroot_dir=/var/run/vsftpd
+xferlog_file=<%= scope.lookupvar('logfile') %>
+pam_service_name=vsftpd
+
+anon_root=/srv/upload.debian.org/ftp
+write_enable=YES
+anon_umask=027
+anon_upload_enable=YES
+chown_uploads=YES
+chown_username=dak
+

diff --git a/modules/roles/templates/security_mirror/vsftpd.conf b/modules/roles/templates/security_mirror/vsftpd.conf
deleted file mode 100644 (file)
index f75a966..0000000
--- a/modules/roles/templates/security_mirror/vsftpd.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-anonymous_enable=YES
-xferlog_enable=YES
-secure_chroot_dir=/var/run/vsftpd
-pam_service_name=vsftpd
-rsa_cert_file=/etc/ssl/certs/vsftpd.pem
-
-setproctitle_enable=YES
-dirmessage_enable=NO
-connect_from_port_20=NO
-xferlog_file=/var/log/ftp/vsftpd-security.debian.org.log
-xferlog_file=<%= scope.lookupvar('logfile') %>
-ls_recurse_enable=YES
-ftpd_banner=security.debian.org FTP server (vsftpd)

diff --git a/modules/roles/templates/security_mirror/vsftpd.conf.erb b/modules/roles/templates/security_mirror/vsftpd.conf.erb
new file mode 100644 (file)
index 0000000..f75a966
--- /dev/null
+++ b/modules/roles/templates/security_mirror/vsftpd.conf.erb
@@ -0,0 +1,13 @@
+anonymous_enable=YES
+xferlog_enable=YES
+secure_chroot_dir=/var/run/vsftpd
+pam_service_name=vsftpd
+rsa_cert_file=/etc/ssl/certs/vsftpd.pem
+
+setproctitle_enable=YES
+dirmessage_enable=NO
+connect_from_port_20=NO
+xferlog_file=/var/log/ftp/vsftpd-security.debian.org.log
+xferlog_file=<%= scope.lookupvar('logfile') %>
+ls_recurse_enable=YES
+ftpd_banner=security.debian.org FTP server (vsftpd)