summaryrefslogtreecommitdiff
path: root/files/master
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 puppetmaster puppet.conf to puppetversion > 3.5tr
2013-05-20update to latest config.rumh
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-02-15Fix lastruncheck.intrigeri
Patch by pietro.
2012-02-15Merge commit '05a9d526ab7a23dea30058dbb3ac21a9bb521dab'Micah Anderson
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-02-20treat case where host is not in stored configs so farmh
2011-01-10add to puppet::puppetmaster::debian a file resource to manage the ↵Micah Anderson
/etc/default/puppetmaster file shipped with the debian package
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-10-21stage lastcheckmh
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-07improve checklastrun scriptmh
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
2009-11-02parse the timestamps before substracting themmh
2009-07-11enforce logdest for puppet clientmh
2008-12-27added --all option to display allmh
2008-12-27added lastrun checkmh
2008-07-02moved our own fileserver config to the right placemh
2008-04-13fixed ssl-headers for clustersmh
2008-04-10refixed path, reverted to defaultmh
2008-04-10fixed some pathsmh
2008-04-10fixed some configs, changed to new puppetsetupmh
2008-04-04moved /dist/-stuff to /files/, heavily refactored a lot, made it more look ↵mh
all the same way. some sources added here and there. hope it still works everything, the location on the disk of /files/ is still call dists. no need to hurry to change that
2008-03-30some docu for mastermh
2008-03-23changed puppetmaster config to be possible to releasemh
2008-02-08added flushmh
2008-01-31added puppet module to manage configgiles, removed unneeded patches for ↵mh
0.24.1, moved config to manifests folder