From 0f4718f062f7419092f69dcdd951339a466a79b8 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 7 Jul 2011 00:52:08 +0200 Subject: migrate cleanup_reports to parametrized classes as this makes it much more configurable --- README | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'README') diff --git a/README b/README index 2063b03..69e5928 100644 --- a/README +++ b/README @@ -62,11 +62,20 @@ Reports cleanup: --------------- By default we clean up reports older than 30 days. If you want to change -that, you can set $puppetmaster_cleanup_reports to one of the following -values: +that, you can subclass puppet::puppetmaster and overwrite the included class and +include that one instead: + +class mypuppetmaster inherits puppet::master { + Class['puppet::puppetmaster::cleanup_reports']{ + cleanup_older_than => 'absent' + } +} + +Where 'absent' means not to cleanup records and X any other amount of days. + +You can also adjust the locations of the reports to your needs, by setting the param +`reports_dir` to something different. -* 'X', where X is the amount of days you want to keep reports for -* false, to disable reports cleanup Check last run: --------------- -- cgit v1.2.3 From 9a18424b2bdf3506737a28ca56a25e20950d6d68 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 7 Jul 2011 01:21:06 +0200 Subject: Revert "migrate cleanup_reports to parametrized classes as this makes it much more configurable" This reverts commit 0f4718f062f7419092f69dcdd951339a466a79b8. Unfortuantely due to puppet bug #5517 we currently can't do it that nice so we need to hack around things https://projects.puppetlabs.com/issues/5517 --- README | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'README') diff --git a/README b/README index 69e5928..2063b03 100644 --- a/README +++ b/README @@ -62,20 +62,11 @@ Reports cleanup: --------------- By default we clean up reports older than 30 days. If you want to change -that, you can subclass puppet::puppetmaster and overwrite the included class and -include that one instead: - -class mypuppetmaster inherits puppet::master { - Class['puppet::puppetmaster::cleanup_reports']{ - cleanup_older_than => 'absent' - } -} - -Where 'absent' means not to cleanup records and X any other amount of days. - -You can also adjust the locations of the reports to your needs, by setting the param -`reports_dir` to something different. +that, you can set $puppetmaster_cleanup_reports to one of the following +values: +* 'X', where X is the amount of days you want to keep reports for +* false, to disable reports cleanup Check last run: --------------- -- cgit v1.2.3 From b3dc59ba25d05529936736297334ce86b402445f Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 7 Jul 2011 01:24:29 +0200 Subject: implement setting reports cleanup dir the old way --- README | 3 +++ 1 file changed, 3 insertions(+) (limited to 'README') diff --git a/README b/README index 2063b03..ff74b2d 100644 --- a/README +++ b/README @@ -68,6 +68,9 @@ values: * 'X', where X is the amount of days you want to keep reports for * false, to disable reports cleanup +If your reports are in a different place than the default, you can set +$puppetmaster_reports dir to adjust their location. + Check last run: --------------- -- cgit v1.2.3 From 02d3c6ec11c441a5ab59a5ca001afd6a3f449933 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 7 Jul 2011 01:29:51 +0200 Subject: README typo --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README') diff --git a/README b/README index ff74b2d..3c71a5f 100644 --- a/README +++ b/README @@ -69,7 +69,7 @@ values: * false, to disable reports cleanup If your reports are in a different place than the default, you can set -$puppetmaster_reports dir to adjust their location. +$puppetmaster_reports_dir to adjust their location. Check last run: --------------- -- cgit v1.2.3 From dd380fa91507155d5cfe8ea87023903eb91a18b0 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 27 Jun 2012 22:58:41 -0400 Subject: 2.7 underscore rename: site-puppet --- README | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'README') diff --git a/README b/README index 3c71a5f..ea07f0a 100644 --- a/README +++ b/README @@ -1,10 +1,10 @@ Puppet-Module for configuring Puppet itself, both the master and the clients ============================================================================ -Use a seperate local module called "site-puppet", where you place your customized +Use a seperate local module called "site_puppet", where you place your customized files, under: - site-puppet/files/master/fileserver.conf - site-puppet/files/master/puppet.conf + site_puppet/files/master/fileserver.conf + site_puppet/files/master/puppet.conf Usage ===== @@ -95,7 +95,7 @@ $puppet_storeconfig_password to the puppet database password, and then set $puppetmaster_storeconfigs = true to enable stored configs. Then you will need to either put in your node definition, or in -site-puppet/manifests/init.pp puppet::puppetmaster::hasdb to setup the database +site_puppet/manifests/init.pp puppet::puppetmaster::hasdb to setup the database with the right parameters. This will setup your storeconfigs database, adding to the database the correct user, the correct grant permissions, and also setup a munin graph, if you have $use_munin = true @@ -115,14 +115,14 @@ node puppetmaster { $use_munin = true $puppetmaster_mode = 'passenger' $puppet_crontime = "0,12 * * * *" - include site-puppet::master + include site_puppet::master include puppet::cron include puppet::puppetmaster ... -in your site-puppet/manifests/master.pp you could include something like: +in your site_puppet/manifests/master.pp you could include something like: -class site-puppet::master { +class site_puppet::master { ... puppet::puppetmaster::hasdb { "puppet": dbname => 'puppetmaster', -- cgit v1.2.3 From 0d7241bc0849be42e365b65e9bfaad984029fdbf Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 16 Jul 2012 14:15:36 -0400 Subject: add information to README about specifying versions --- README | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'README') diff --git a/README b/README index ea07f0a..cf068ee 100644 --- a/README +++ b/README @@ -12,6 +12,18 @@ Usage The module currently looks for values on different variables to adjust configuration of the master. +Installing a specific versions +------------------------------ + +If you need to install a different version of puppet, other than the most recent, +you can set the following variable: + +$puppet_ensure_version = '2.7.18-1~bpo60+1' + +You can also specify a different facter version by setting the following variable: + +$facter_ensure_version = '1.6.9-2~bpo60+2' + Run puppet by cron: ------------------- @@ -49,6 +61,13 @@ mode, you can set $puppetmaster_mode either to: In both cases you have to setup the appropriate frontends (apache vhost configuration/nginx vhost configuration) on your own. +If you need to install a specific version of puppetmaster, you can specify the +version to be installed by doing the following: + +$puppetmaster_ensure_version = '2.7.18-1~bpo60+1' + +NOTE: You will need the apt module in order to specify the puppetmaster version. + Munin ----- -- cgit v1.2.3 From c5f6f891cf4ea2e804f409db0a33515469568e3e Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 16 Jul 2012 14:15:50 -0400 Subject: minor README language fix --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README') diff --git a/README b/README index cf068ee..b0d8e2e 100644 --- a/README +++ b/README @@ -9,8 +9,8 @@ files, under: Usage ===== -The module currently looks for values on different variables to adjust -configuration of the master. +The module currently looks for different variable values to adjust configuration +of the master. Installing a specific versions ------------------------------ -- cgit v1.2.3 From ed7d89163385a6eab4423aae7ce8b5d994339a2f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 16 Jul 2012 15:10:47 -0400 Subject: update README to specify that the $puppetmaster_ensure_version only works for debian --- README | 1 + 1 file changed, 1 insertion(+) (limited to 'README') diff --git a/README b/README index b0d8e2e..6fd494e 100644 --- a/README +++ b/README @@ -67,6 +67,7 @@ version to be installed by doing the following: $puppetmaster_ensure_version = '2.7.18-1~bpo60+1' NOTE: You will need the apt module in order to specify the puppetmaster version. +Also, this functionality is only implemented for Debian and derived distributions. Munin ----- -- cgit v1.2.3