refactoring, part 1

manifests/puppetmaster.pp

@@ -1,29 +1,17 @@
-class puppet::puppetmaster ($ensure = 'present', $puppetqd = false) {
-  require 'puppet::common'
-
+class puppet::puppetmaster (
+  $ensure               = 'present',
+  $dns_alt_names        = undef,
+  $storeconfigs         = false,
+  $storeconfigs_backend = undef,
+  $reports              = undef,
+  $modulepath           = undef) {
+  require 'puppet::facter'
+  
   if !defined(Class['puppet::puppetlabs_apt']) {
     class { 'puppet::puppetlabs_apt': }
     require 'puppet::puppetlabs_apt'
   }
 
-  if $puppetqd {
-    class { 'activemq': ensure => $ensure }
-
-    package { 'libnet-arp-perl': ensure => $ensure }
-
-    service { 'stompserver':
-      ensure => false,
-      enable => false,
-      before => Class['activemq'],
-    }
-
-    service { 'puppetqd':
-      ensure  => running,
-      pattern => 'puppet queue queue',
-      enable  => true,
-    }
-  }
-
   if defined(Class['ganglia::monitor']) {
     Ganglia::Gmetric::Cron {
       source => 'puppet/ganglia',
@@ -41,7 +29,7 @@ class puppet::puppetmaster ($ensure = 'present', $puppetqd = false) {
 
   # ## remove disk reports from time to time
   tidy { "${::puppet_vardir}/reports":
-    age     => '1d',
+    age     => '1m',
     recurse => true,
     backup  => false,
   }