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, 32 insertions, 68 deletions

diff --git a/files/master/puppet.conf b/files/master/puppet.conf
index f6471d7..893dfb6 100644
--- a/files/master/puppet.conf
+++ b/files/master/puppet.conf
@@ -1,72 +1,36 @@
 [main]
-    confdir=/srv/puppet/etc
-
-    # Where Puppet stores dynamic and growing data.
-    # The default value is '/var/puppet'.
-    vardir = /srv/puppet
-
-    # The Puppet log directory.
-    # The default value is '$vardir/log'.
-    logdir = /var/log/puppet
-
-    # Where Puppet PID files are kept.
-    # The default value is '$vardir/run'.
-    rundir = /var/run/puppet
-
-    # Where SSL certificates are kept.
-    # The default value is '$confdir/ssl'.
-    ssldir = $vardir/ssl
-
-    factpath = $vardir/lib/facter
-    plugindest = $vardir/lib/puppet
-
-[agent]
-    # The file in which puppetd stores a list of the classes
-    # associated with the retrieved configuratiion.  Can be loaded in
-    # the separate ``puppet`` executable using the ``--loadclasses``
-    # option.
-    # The default value is '$confdir/classes.txt'.
-    classfile = $vardir/classes.txt
-
-    # Where puppetd caches the local configuration.  An
-    # extension indicating the cache format is added automatically.
-    # The default value is '$confdir/localconfig'.
-    localconfig = $vardir/localconfig
-
-    report=true
-    pluginsync = true
-
-    logdest=/var/log/puppet/puppet.log
+	confdir						= /etc/puppet
+	logdir						= /var/log/puppet
+	vardir						= /var/lib/puppet
+	ssldir						= $vardir/ssl
+	rundir						= /var/run/puppet
+	factpath					= $vardir/lib/facter
+	templatedir					= $confdir/templates
+	#certname					= puppetmaster01.example.com
+	#server						= puppet.example.com
+	#user						= pe-puppet
+	#group						= pe-puppet
+	#archive_files				= true
+	#archive_file_server			= puppet.example.com
 
 [master]
-    reportdir = $logdir/reports
-    autoflush = true
-    #storeconfigs=true
-    dbadapter=mysql
-    dbserver=localhost
-    dbuser=puppet
-    dbpassword=****************
-    dbsocket=/var/lib/mysql/mysql.sock
-
-    #usage for clusters
-    #ssl_client_header=HTTP_X_SSL_SUBJECT
-
-    # apache2/passenger usage: http://github.com/reductivelabs/puppet/tree/master/ext/rack
-    ssl_client_header = SSL_CLIENT_S_DN
-    ssl_client_verify_header = SSL_CLIENT_VERIFY
-
-
-    # specify allowed environments
-    environments=production,development
-
-    # configure environments
-    [development]
-    manifest=$vardir/development/etc/manifests/site.pp
-    modulepath=$vardir/development/modules/
-    templatepath=$vardir/development/templates/
-
-    [production]
-    manifest=$vardir/production/etc/manifests/site.pp
-    modulepath=$vardir/production/modules/
-    templatepath=$vardir/production/templates/
+	#certname					= puppetmaster01.example.com
+	#dns_alt_names				= puppetmaster01,puppetmaster01.example.com,puppet,puppet.example.com
+	#ca_name						= 'Puppet CA generated on puppetmaster01.example.com at 2013-08-09 19:11:11 +0000'
+	reports						= http,puppetdb
+	reporturl					= https://localhost:443/reports/upload
+	#node_terminus				= exec
+	#external_nodes				= /etc/puppetlabs/puppet-dashboard/external_node
+	ssl_client_header			= SSL_CLIENT_S_DN
+	ssl_client_verify_header	= SSL_CLIENT_VERIFY
+	#storeconfigs_backend		= puppetdb
+	#storeconfigs				= true
+	#autosign					= true
 
+[agent]
+	report						= true
+	classfile					= $vardir/classes.txt
+	localconfig					= $vardir/localconfig
+	graph						= true
+	pluginsync					= true
+	environment					= production