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

diff --git a/manifests/master/base.pp b/manifests/master/base.pp
new file mode 100644
index 0000000..4931264
--- /dev/null
+++ b/manifests/master/base.pp
@@ -0,0 +1,42 @@
+# overwrite a few things for the master
+class puppet::master::base inherits puppet::base {
+
+  file { $puppet::master::fileserver:
+    source  => ["puppet:///modules/site_puppet/master/${::fqdn}/fileserver.conf",
+                'puppet:///modules/site_puppet/master/fileserver.conf',
+                'puppet:///modules/puppet/master/fileserver.conf' ],
+    owner   => root,
+    group   => puppet,
+    mode    => '0640';
+  }
+
+  if !$puppet::master::config_content {
+    File['puppet_config']{
+      source => [ "puppet:///modules/site_puppet/master/${::fqdn}/puppet.conf",
+                  'puppet:///modules/site_puppet/master/puppet.conf',
+                  'puppet:///modules/puppet/master/puppet.conf' ]
+    }
+  }
+
+  if $puppet::master::storeconfigs {
+    include puppet::master::storeconfigs
+  }
+
+
+  if $puppet::master::mode == 'passenger' {
+    include puppet::master::passenger
+    File[$puppet::master::fileserver]{
+      notify => Exec['notify_passenger_puppetmaster'],
+    }
+    File[puppet_config]{
+      notify => Exec['notify_passenger_puppetmaster'],
+    }
+  } else {
+    File[$puppet::master::fileserver]{
+      notify => Service[puppetmaster],
+    }
+    File[puppet_config]{
+      notify => Service[puppetmaster],
+    }
+  }
+}