From 99bb0049d87452ec9ff7a41974a402ae740153cb Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 23 Apr 2012 12:02:06 +0100 Subject: [PATCH] vsftpd should only be on master Signed-off-by: Stephen Gran --- .../{backports_mirror => backports_master}/vsftpd.conf | 0 modules/roles/manifests/backports_master.pp | 8 ++++++++ modules/roles/manifests/backports_mirror.pp | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) rename modules/roles/files/{backports_mirror => backports_master}/vsftpd.conf (100%) create mode 100644 modules/roles/manifests/backports_master.pp diff --git a/modules/roles/files/backports_mirror/vsftpd.conf b/modules/roles/files/backports_master/vsftpd.conf similarity index 100% rename from modules/roles/files/backports_mirror/vsftpd.conf rename to modules/roles/files/backports_master/vsftpd.conf diff --git a/modules/roles/manifests/backports_master.pp b/modules/roles/manifests/backports_master.pp new file mode 100644 index 000000000..dcb2af472 --- /dev/null +++ b/modules/roles/manifests/backports_master.pp @@ -0,0 +1,8 @@ +class roles::backports_master { + + include roles::backports_mirror + + class { 'vsftpd::site': + source => 'puppet:///modules/roles/backports_master/vsftpd.conf' + } +} diff --git a/modules/roles/manifests/backports_mirror.pp b/modules/roles/manifests/backports_mirror.pp index e7ccf58e3..2d794859a 100644 --- a/modules/roles/manifests/backports_mirror.pp +++ b/modules/roles/manifests/backports_mirror.pp @@ -11,8 +11,4 @@ class roles::backports_mirror { apache2::module { 'rewrite': } - class { 'vsftpd::site': - source => 'puppet:///modules/roles/backports_mirror/vsftpd.conf' - } - } -- 2.20.1