summaryrefslogtreecommitdiff
path: root/files
AgeCommit message (Collapse)Author
2015-03-27Merge remote-tracking branch ↵Micah Anderson
'tails/bugfix/8379-lastruncheck-compatibility-with-puppet-3.x'
2015-02-24Merge branch 'master' of git://git.puppet.immerda.ch/module-puppetJerome Charaoui
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
2014-12-03Upgrade lastruncheck to the latest upstream version (Closes: #8379).intrigeri
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.
2014-05-03update the puppetclient puppet.conf to puppetversion > 3.5tr
2014-05-03update the puppetmaster puppet.conf to puppetversion > 3.5tr
2013-05-20update to latest config.rumh
2013-05-20follow new naming conventionmh
2012-12-07fix an issue if nothing got compiledmh
2012-12-07improve puppet munin pluginmh
2012-10-02modified lastruncheck to run under v2.7.x, see ↵varac
github.com/cafuego/check_puppetmaster
2012-07-16update config.ru to newer version as supplied by puppetlabs for passenger ↵Micah Anderson
applications. This is likely not to work with older versions of passenger
2012-07-16update puppet.conf default file to have the newer section headings, required ↵Micah Anderson
to eliminate deprecation warnings
2012-06-27Merge remote-tracking branch 'shared/master'Micah Anderson
2012-04-12Merge remote-tracking branch 'lelutin/freebsd' into sharedMicah Anderson
2012-02-15Fix lastruncheck.intrigeri
Patch by pietro.
2012-02-15Merge commit '05a9d526ab7a23dea30058dbb3ac21a9bb521dab'Micah Anderson
2011-08-23Fix ssldir value for FreeBSD configGabriel Filion
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>
2011-07-16Support puppet client for FreeBSDGabriel Filion
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>
2011-05-21Fix development environment's modules path.intrigeri
2011-05-07Merge remote branch 'immerda/master'intrigeri
2011-04-17no need to log to the console as we don't use puppets logging featuremh
2011-04-13updated allow insatll of puppetmaster on squeeze. This addresses theKeith aka fugit
package diferences.
2011-04-03find not searchmh
2011-04-03fix lastruncheck to be compatible for 2.6.7mh
2011-03-28add missing redirection to /dev/null for the first puppet restart: #2690Micah Anderson
2011-03-15instead of using $RANDOM, which isn't POSIX, we get even more esoteric by ↵Micah Anderson
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.
2011-02-20treat case where host is not in stored configs so farmh
2011-01-11on debian, the default /etc/default/puppet file has "START=no", the default ↵Micah Anderson
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.
2011-01-10fix the bc dependency (closes: #2690)Micah Anderson
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
2011-01-10add to puppet::puppetmaster::debian a file resource to manage the ↵Micah Anderson
/etc/default/puppetmaster file shipped with the debian package
2011-01-10add a $use_munin variable to give a knob to turn on/off munin graphing.Micah Anderson
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
2010-12-14Merge remote branch 'immerda/master' into immerdaMicah Anderson
Conflicts: manifests/puppetmaster/checklastrun.pp manifests/puppetmaster/checklastrun/disable.pp
2010-12-07convert timestamp first to a string to be sure we handle all the same waymh
2010-12-06looks like last_compile can be nil sometimesmh
2010-11-29rather use last_compile than last updatemh
2010-11-29replace puppetlast with much more improved versionmh
2010-11-28default client puppet.conf changes:Micah Anderson
. 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
2010-10-21stage lastcheckmh
2010-08-31factsync is a deprecated option - pluginsync is enoughmh
2010-08-19this is not anymore needed on 2.6mh
2010-08-19turn plugin and fact sync onmh
As we use custom facts and plugins in our modules I think it's safe to turn them on by default.
2010-08-08add 2.6 configuration for clientmh
2010-08-07improve checklastrun scriptmh
2010-08-06remove unnecessary filemh
2010-07-14Merge remote branch 'shared-modules/master'varac
2010-02-15cleaned puppet.conf for the clientsnadir
2010-02-03added vardir + ssldir because passenger driven puppetmasterd sometimes ↵varac
doesn't read the config at the very startup
2010-01-24Added puppet::puppetmaster::passenger class to enable apache/passenger supportvarac
2010-01-24added apache/passenger config variablesvarac
2010-01-19took out "server=puppet.glei.ch"varac