summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-03-01 00:34:37 +0000
committerMicah <micah@riseup.net>2015-03-01 00:34:37 +0000
commit70d2dd696696b14c5011580f994c6520b028f32a (patch)
treeacd91c59fea86768f81d98e262ed1677f646fa47 /README
parentbeae5a608dd1b1d370917896d853a6b53ad73a45 (diff)
parent0bb70b28a7c7679d0e07fd75230d40203c0d53b5 (diff)
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
Diffstat (limited to 'README')
-rw-r--r--README4
1 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index 3210c7b..20015e1 100644
--- a/README
+++ b/README
@@ -31,14 +31,14 @@ By default puppet runs as its own daemon. However, you might want to run puppet
by cron. To do this, you have to include `puppet::cron` instead of `puppet`. If
you include puppet::cron then by default puppet will run twice an hour, spread
amongst the half an hour depending on the host's fqdn. If you wish to change
-that interval, you can tweak $puppet_crontime (NOTE: this variable only operates
+that interval, you can tweak $crontime (NOTE: this variable only operates
on the minute cron field).
Clientbucket cleanup:
---------------------
The individual node client buckets aren't cleaned up automatically, unless you
-specify $puppet_cleanup_clientbucket = 'X', where X is the number of days you
+specify cleanup_clientbucket = 'X', where X is the number of days you
want to keep clientbucket files for.
Use http compression