From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 10:45:13 +0000 (+0200)
Subject: include signing from the ftp_master role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e223cc6541f3d038e37352a0fac74010bd7ca624;p=mirror%2Fdsa-puppet.git

include signing from the ftp_master role
---

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 92a11ba73..1b68123c4 100644
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -1,5 +1,6 @@
 class roles::ftp_master {
   include roles::dakmaster
+  include roles::signing
 
   rsync::site { 'dakmaster':
     source      => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ff29abb1b..4f10b9212 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -31,7 +31,6 @@ class roles {
 	}
 	if has_role('ftp_master') {
 		include roles::ftp_master
-		include roles::signing
 	}
 
 	if has_role('security_mirror') {