Merge branch 'merge_immerda' into 'master'

Merge immerda's changes

GENERAL CHANGES
* Now uses parameterized classes
* Deprecates all top-scope "$puppet_*" variables
* File source path changed from "site-puppet" to "site_puppet"

master/puppet.conf
* [main] default vardir changed /srv/puppet to /var/lib/puppet
* [main] plugindest removed
* [agent] logdest removed
* [environments] removed

base.pp
* new $puppet::config, $puppet::config_content

cron/base.pp
* new $puppet::cron::cron_time, $puppet::http_compression, $puppet::cron::stop_service

cron.pp
* new puppet::cron parameterized class

debian.pp
* $puppet_ensure_version now $puppet::ensure_version

init.pp
* new puppet parameteried class
* $use_shorewall deprecated

linux.pp
* $facter_ensure_version now $puppet::facter_ensure_version

master/linux.pp
* $puppetmaster_mode changed to $puppet::master::mode
* does not require apache::base

master
* class puppet:puppetmaster::* renamed puppet::master::*
* $puppet_fileserverconfig changed to $puppet::master::fileserver
* added $puppet::master::config_content
* $puppetmaster_storeconfigs changed to $puppet::master::storeconfigs

master/lastruncheck.pp
* $::puppet_lastruncheck_ignorehosts  changed to $puppet::master::lastruncheck_ignorehosts
* $::puppet_lastruncheck_ignorehosts_str  changed to $puppet::master::lastruncheck_ignorehosts_str
* $::puppet_lastruncheck_timeout_str  changed to $puppet::master::lastruncheck_timeout_str
* does not include cron
* /etc/cron.d/puppetlast command changed

master/cleanupreports
* $puppetmaster_cleanup_reports[_dir] changed to $puppet::master::reports[_dir]
* cron filename changed

master/passenger
* does not install puppetmaster-passenger package on Debian anymore
* restart mechanism by creating /etc/puppet/rack/tmp/restart.txt
* does not manage /usr/share/puppet/rack/puppetmasterd/config.ru anymore, config.ru expected at /etc/puppet/rack (check your Apache configs)

See merge request !1

1 files changed, 9 insertions, 9 deletions

diff --git a/manifests/linux.pp b/manifests/linux.pp
index e752788..7bf3331 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -1,13 +1,12 @@
+# puppet on linux
 class puppet::linux inherits puppet::base {
 
-  if !$puppet_ensure_version { $puppet_ensure_version = 'installed' }
   package { 'puppet':
-    ensure => $puppet_ensure_version,
+    ensure => $puppet::ensure_version,
   }
 
-  if !$facter_ensure_version { $facter_ensure_version = 'installed' }
   package { 'facter':
-    ensure => $facter_ensure_version,
+    ensure => $puppet::ensure_facter_version,
   }
 
   Service['puppet']{
@@ -15,10 +14,11 @@ class puppet::linux inherits puppet::base {
   }
 
   file { '/etc/cron.d/puppetd':
-    ensure => absent
-  }
-  # For backwards compatibility, remove this so that the cron is not duplicated
-  file { '/etc/cron.d/puppetd.cron':
-    ensure => absent
+    source  => ['puppet:///modules/site_puppet/cron.d/puppetd',
+                "puppet:///modules/puppet/cron.d/puppetd.${::operatingsystem}",
+                'puppet:///modules/puppet/cron.d/puppetd' ],
+    owner   => root,
+    group   => 0,
+    mode    => '0644',
   }
 }