From 68b16519f3f82ef7d5b5b5e3d523fbc80b09dada Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Thu, 9 Feb 2012 09:10:53 +0000
Subject: split puppet::master in a separate file, reindent it and add a
 include for puppet::queue since that's needed

---
 modules/puppet/manifests/init.pp   | 37 -------------------------------------
 modules/puppet/manifests/master.pp | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 modules/puppet/manifests/master.pp

(limited to 'modules')

diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp
index c2e26794..7c8f2111 100644
--- a/modules/puppet/manifests/init.pp
+++ b/modules/puppet/manifests/init.pp
@@ -1,39 +1,2 @@
 class puppet {
-   class master {
-        include puppet::client
-
-        # rails and sqlite3 are used for stored config
-        package { ['ruby-sqlite3', 'puppet-server', 'ruby-rails']: }
-
-        service { puppetmaster:
-            subscribe => [ Package[puppet-server], File["/etc/puppet/puppet.conf"]]
-        }
-
-        file { "/etc/puppet/extdata":
-            ensure => directory,
-            owner => puppet,
-            group => puppet,
-            mode => 700,
-            recurse => true
-        }
-
-        file { '/etc/puppet/tagmail.conf':
-            content => template("puppet/tagmail.conf"),
-        }
-
-        tidy { "/var/lib/puppet/reports":
-            age     => "4w",
-            matches => "*.yaml",
-            recurse => true,
-            type    => "mtime",
-        }
-
-        file { "/etc/puppet/autosign.conf":
-            ensure =>  $environment ? {
-                        'test' => 'present',
-                        default =>  'absent',
-            },
-            content => '*',
-        }
-    }
 }
diff --git a/modules/puppet/manifests/master.pp b/modules/puppet/manifests/master.pp
new file mode 100644
index 00000000..243e8137
--- /dev/null
+++ b/modules/puppet/manifests/master.pp
@@ -0,0 +1,38 @@
+class puppet::master {
+    include puppet::client
+    include puppet::queue
+
+    # rails and sqlite3 are used for stored config
+    package { ['ruby-sqlite3', 'puppet-server', 'ruby-rails']: }
+
+    service { puppetmaster:
+        subscribe => [ Package['puppet-server'], File['/etc/puppet/puppet.conf']]
+    }
+
+    file { '/etc/puppet/extdata':
+        ensure => directory,
+        owner  => puppet,
+        group  => puppet,
+        mode   => '0700',
+        recurse => true,
+    }
+
+    file { '/etc/puppet/tagmail.conf':
+        content => template("puppet/tagmail.conf"),
+    }
+
+    tidy { '/var/lib/puppet/reports':
+        age     => "4w",
+        matches => "*.yaml",
+        recurse => true,
+        type    => "mtime",
+    }
+
+    file { '/etc/puppet/autosign.conf':
+        ensure  => $environment ? {
+                    'test'  => 'present',
+                    default => 'absent',
+        },
+        content => '*',
+    }
+}
-- 
cgit v1.2.1