make ftp-master include dakmaster directly

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index c733479..92a11ba 100644 (file)
--- 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 dcf42e0..ff29abb 100644 (file)
--- 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
        }