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, 27 insertions, 5 deletions

diff --git a/manifests/cron.pp b/manifests/cron.pp
index 8cb4644..9a8e777 100644
--- a/manifests/cron.pp
+++ b/manifests/cron.pp
@@ -1,10 +1,32 @@
-class puppet::cron inherits puppet {
-  case $operatingsystem {
-    debian,ubuntu: { include puppet::cron::linux }
+# run puppet agent as cron
+class puppet::cron(
+  $cron_time,
+  $stop_service                     = true,
+  $config                           = '/etc/puppet/puppet.conf',
+  $config_content                   = false,
+  $http_compression                 = 'puppet_http_compression',
+  $cleanup_clientbucket             = false,
+  $ensure_version                   = 'installed',
+  $ensure_facter_version            = 'installed',
+  $shorewall_puppetmaster           = false,
+  $shorewall_puppetmaster_port      = '8140',
+  $shorewall_puppetmaster_signport  = '8141'
+) {
+  class{'puppet':
+    config                          => $config,
+    config_content                  => $config_content,
+    http_compression                => $http_compression,
+    cleanup_clientbucket            => $cleanup_clientbucket,
+    ensure_version                  => $ensure_version,
+    ensure_facter_version           => $ensure_facter_version,
+    shorewall_puppetmaster          => $shorewall_puppetmaster,
+    shorewall_puppetmaster_port     => $shorewall_puppetmaster_port,
+    shorewall_puppetmaster_signport => $shorewall_puppetmaster_signport,
+  }
+  case $::operatingsystem {
     openbsd: { include puppet::cron::openbsd }
-    freebsd: { include puppet::cron::freebsd }
     default: {
-      case $kernel {
+      case $::kernel {
         linux: { include puppet::cron::linux }
         default: { include puppet::cron::base }
       }