From e91bb90b4afe134e8e1c0781b89650997b1d4960 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 12:44:21 +0200
Subject: [PATCH] make ftp-master include dakmaster directly

---
 modules/roles/manifests/ftp_master.pp | 2 ++
 modules/roles/manifests/init.pp       | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index c73347932..92a11ba73 100644
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -1,4 +1,6 @@
 class roles::ftp_master {
+  include roles::dakmaster
+
   rsync::site { 'dakmaster':
     source      => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
     # Needs to be at least number of direct mirrors plus some spare
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index dcf42e04c..ff29abb1b 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::dakmaster
 		include roles::signing
 	}
 
-- 
2.20.1