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, 0 insertions, 36 deletions

diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
deleted file mode 100644
index e4278c7..0000000
--- a/manifests/puppetmaster/checklastrun.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-class puppet::puppetmaster::checklastrun {
-
-  $puppet_lastruncheck_ignorehosts_str = $::puppet_lastruncheck_ignorehosts ? {
-    ''      => '',
-    undef   => '',
-    default => "--ignore-hosts ${::puppet_lastruncheck_ignorehosts}"
-  }
-
-  $puppet_lastruncheck_timeout_str = $::puppet_lastruncheck_timeout ? {
-    ''      => '',
-    undef   => '',
-    default => "--timeout ${::puppet_lastruncheck_timeout}"
-  }
-
-  include ::cron
-
-  file{
-    '/usr/local/sbin/puppetlast':
-      source => [ 'puppet:///modules/puppet/master/lastruncheck' ],
-      owner  => root,
-      group  => 0,
-      mode   => '0700';
-
-    '/etc/cron.d/puppetlast':
-      content => "${puppetmaster_lastruncheck_cron} root output=\$(/usr/local/sbin/puppetlast ${puppet_lastruncheck_timeout_str} ${puppet_lastruncheck_ignorehosts_str} ${$puppet_lastruncheck_additionaloptions} 2>&1) || echo \"\$output\"\n",
-      require => File['/usr/local/sbin/puppetlast'],
-      owner   => root,
-      group   => 0,
-      mode    => '0644',
-      notify  => Service['cron'];
-
-    # Cleanup cronjob previously installed under a buggy name.
-    '/etc/cron.d/puppetlast.cron':
-      ensure => absent;
-  }
-}