Age | Commit message (Collapse) | Author |
|
'tails/bugfix/8379-lastruncheck-compatibility-with-puppet-3.x'
|
|
Conflicts:
files/master/config.ru
files/master/puppet.conf
manifests/base.pp
manifests/centos.pp
manifests/cron.pp
manifests/cron/base.pp
manifests/cron/linux.pp
manifests/debian.pp
manifests/init.pp
manifests/linux.pp
manifests/master/linux.pp
manifests/master/package/debian.pp
manifests/puppetmaster/base.pp
manifests/puppetmaster/centos.pp
manifests/puppetmaster/checklastrun.pp
manifests/puppetmaster/checklastrun/disable.pp
manifests/puppetmaster/cleanup_reports.pp
manifests/puppetmaster/cleanup_reports/disable.pp
manifests/puppetmaster/debian.pp
manifests/puppetmaster/package.pp
manifests/puppetmaster/package/base.pp
manifests/puppetmaster/passenger.pp
|
|
For a while, we've been copying that file from
https://github.com/cafuego/check_puppetmaster.git. Before this commit, we had
the version from upstream commit c121464. Since then, upstream has improved
a few things, in particular they now call puppet in a way that works with
3.x too.
Detailed --no-merges log:
89a3971c Add optional perfdata to output.
4d352938 - Use "-m1" argument to `grep` to only get the first match. - Check if yaml report exists before running grep against it. If the certificates and reports get out of sync (say, you deleted some reports) you'll get some "No such file or directory"
09c4c1a7 Use non-deprecated cert syntax (3.x) and make binary path and command configurable.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
github.com/cafuego/check_puppetmaster
|
|
applications. This is likely not to work with older versions of passenger
|
|
to eliminate deprecation warnings
|
|
|
|
|
|
Patch by pietro.
|
|
|
|
The default ssl directory in FreeBSD is /var/puppet/ssl, not
/usr/local/etc/puppet/ssl
With the previous value, puppet would refuse to run starting from the
second run, stating that the certificates do not match.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
Some pieces of the puzzle are missing for being able to manage puppet in
FreeBSD.
* Add a default puppet client config template for FreeBSD
* In FreeBSD, puppet.conf is not in /etc/puppet/ so let's provide a
value for this variable in init.pp.
* The rc script for starting and stopping puppet is not located in
/etc/rc.d so let's signify this to Service[puppet]
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
|
|
|
|
package diferences.
|
|
|
|
|
|
|
|
pulling 2 bytes from /dev/urandom, giving them to od which turns them into unsigned decimals, and then we bitshift the output, either by 5 or 6 depending on if we are replacing $RANDOM/1000*60 (right sift by 5 is the same as dividing by 2^N, or /32) or $RANDOM/2000*60 (range of [0,983])
Thanks to dkg for working through this with me, not only did he come up with it faster than a human brain should be able to function, he had the patience to explain all the individual pieces that I did not understand to me.
|
|
|
|
that is shipped with the puppet module had it set to "START=yes". This commit reverts that to the packaged default.
It would probably be better not to ship the exact duplicate of the package's /etc/default/puppet, but rather do something else, when things that are other than the default need to be changed.
|
|
this is done by removing the hacky `if !defined` on the bc package by removing the package dependency altogether and replacing the places where it is used by shell built-in math functions.
this is a follow-up commit to 1455b1f9a55cdffc582fd93fa0bc5c016585760c
|
|
/etc/default/puppetmaster file shipped with the debian package
|
|
add two new munin graphs for puppetmaster: one to graph the memory usage of the running puppetmasters; and one to graph the average compile time
|
|
Conflicts:
manifests/puppetmaster/checklastrun.pp
manifests/puppetmaster/checklastrun/disable.pp
|
|
|
|
|
|
|
|
|
|
. add a default production environment
. add a development environmnet
. due to deprecation notice in 2.6, change the [puppetd] section header to [agent]
. remove the default server puppet.glei.ch, the default server should just be puppet.$fqdn
. remove some option comments that aren't being used
. remove logdest as this isn't a valid option anymore, and was set to the default
. replace the templatedir full path with the $vardir path.
. add the module path
Conflicts:
files/client/puppet.conf
|
|
|
|
|
|
|
|
As we use custom facts and plugins in our modules I think it's safe
to turn them on by default.
|
|
|
|
|
|
|
|
|
|
|
|
doesn't read the config at the very startup
|
|
|
|
|
|
|