From 3bdba330fd5120b6a8e2f624d5ba72d08ded558c Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 28 Apr 2012 16:18:45 +0100 Subject: [PATCH] no, really, template Signed-off-by: Stephen Gran --- modules/roles/manifests/backports_master.pp | 2 +- modules/roles/manifests/ftp.pp | 4 ++-- modules/roles/manifests/ftp_upload.pp | 4 ++-- modules/roles/manifests/security_mirror.pp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp index 38a055a0d..f9443b0ee 100644 --- 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 6a0398473..febecf6ef 100644 --- 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 807332f43..bf6e16fd1 100644 --- 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 2b1baf611..fc19e41a1 100644 --- 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, } -- 2.20.1