merged

manifests/init.pp

@@ -1,4 +1,4 @@
-import 'defines/*.pp'
+#import 'defines/*.pp'
 
 class puppet (
   $ensure          = 'present',
@@ -16,7 +16,7 @@ class puppet (
   }
   $factpath = '/var/lib/puppet/lib/facter'
 
-  require 'puppet::common'
+  require 'puppet::facter'
 
   if !defined(Class['puppet::puppetlabs_apt']) {
     require 'puppet::puppetlabs_apt'
@@ -111,31 +111,20 @@ class puppet (
           },
         }
       }
-
-#      if defined(Class['ganglia::monitor']) {
-#        Ganglia::Gmetric::Cron {
-#          source => 'puppet/ganglia',
-#          ensure => $ensure,
-#        }
-#
-#        ganglia::gmetric::cron { 'puppetd_lastrun.sh': runwhen => '5'; 'puppetd_runtime.sh': runwhen => '15'; }
-#
-#      }
     }
   }
-  $puppet_user = $operatingsystem ? {
+  $puppet_user = $::operatingsystem ? {
     'Darwin' => $adm,
     default  => 'puppet',
   }
-  $puppet_group = $operatingsystem ? {
+  $puppet_group = $::operatingsystem ? {
     'Darwin' => 'wheel',
     default  => 'puppet',
   }
   # 'FreeBSD' => '/usr/local/etc/puppet/puppet.conf',
-  $puppetconf = $operatingsystem ? {
+  $puppetconf = $::operatingsystem ? {
     default => '/etc/puppet/puppet.conf',
   }
-
   file { $puppetconf:
 	  ensure  => $ensure,
 		  content => template('puppet/puppet.conf.erb'),
@@ -144,4 +133,4 @@ class puppet (
 #     require => [ Package["puppet"] ],
   }
 
-  }
+}