no, really, template

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 38a055a0d8f5c7be8848f02b99cb57dd937503f0..f9443b0ee47533f95bbe0f1057bc50c754415936 100644 (file)
--- a/modules/roles/manifests/backports_master.pp
+++ b/modules/roles/manifests/backports_master.pp
@@ -20,7 +20,7 @@ class roles::backports_master {
 
        if $bind6 {
                vsftpd::site { 'backports-v6':
-                       source  => template('roles/backports_mirror/vsftpd.conf.erb'),
+                       content => 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 6a03984737578d7ad0837f9c8d253c13839add37..febecf6ef8f498625952a84608daf3a0b70120d5 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -15,14 +15,14 @@ class roles::ftp {
        $logfile = '/var/log/ftp/vsftpd-ftp.debian.org.log'
 
        vsftpd::site { 'ftp':
-               source  => template('roles/ftp/vsftpd.conf.erb'),
+               content => template('roles/ftp/vsftpd.conf.erb'),
                logfile => $logfile,
                bind    => $bind,
        }
 
        if $bind6 {
                vsftpd::site { 'ftp-v6':
-                       source  => template('roles/ftp/vsftpd.conf.erb'),
+                       content => 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 807332f43ff19aa9252af4d6d9d6807ff1c40bb0..bf6e16fd14a6c75a983faa15918229f93d7684e1 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -11,14 +11,14 @@ class roles::ftp_upload {
        $logfile = '/var/log/ftp/vsftpd-ftp.upload.debian.org.log'
 
        vsftpd::site { 'ftp-upload':
-               source  => template('roles/ftp_upload/vsftpd.conf.erb'),
+               content => template('roles/ftp_upload/vsftpd.conf.erb'),
                logfile => $logfile,
                bind    => $bind,
        }
 
        if $bind6 {
                vsftpd::site { 'ftp-upload-v6':
-                       source  => template('roles/ftp_upload/vsftpd.conf.erb'),
+                       content => 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 2b1baf6117fa0d45ee793e9d7188dfe551588339..fc19e41a10bcb69b404b358cb1e32add0266423c 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -16,14 +16,14 @@ class roles::security_mirror {
        $logfile = '/var/log/ftp/vsftpd-security.debian.org.log'
 
        vsftpd::site { 'security':
-               source  => template('roles/security_mirror/vsftpd.conf.erb'),
+               content => template('roles/security_mirror/vsftpd.conf.erb'),
                logfile => $logfile,
                bind    => $bind,
        }
 
        if $bind6 {
                vsftpd::site { 'security-v6':
-                       source  => template('roles/security_mirror/vsftpd.conf.erb'),
+                       content => template('roles/security_mirror/vsftpd.conf.erb'),
                        logfile => $logfile,
                        bind    => $bind6,
                }