| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
manifests/puppetmaster/debian.pp
manifests/puppetmaster/linux.pp
manifests/puppetmaster/package/debian.pp
|
|
have the service definition for 'puppetmaster' be actually looking in the process list for 'apache2'. This sort of worked, but not if you need to notify the service for a restart.
It also didn't actually work, because the hasstatus parameter was set to true, which meant that on every run, puppet did a /etc/init.d/puppetmaster status and found that it was not running and then tried to start it by doing /etc/init.d/puppetmaster start. That doesn't work because its turned off in /etc/default/puppetmaster when puppetmaster_mode='passenger'.
So... this commit removes that hacky service definition and instead just requires the apache::base class, providing the apache service monitoring that is needed when you are running puppetmaster_mode='passenger'. It also has to pull up the Service[puppet] override which was adding the puppetmaster service, which makes no sense because there is no service.
Finally, in order to notify it for changes, we need to use a selector to determine how to reload things based on puppetmaster_mode.
|
|
otherwise you now get following error:
err: Could not retrieve catalog from remote server: Error 400 on SERVER:
Could not find resource(s) Package[puppetmaster] for overriding on node
flea.leap.se
see https://leap.se/code/issues/198
|
|
are not doing any overrides, instead we can just include the classes that we also want to load
|
|
needed or not, this is handled by the apt::preferences_snippet and debian's package dependency resolution now
stop inheriting puppet::master::package::base from puppet::puppetmaster::package::debian, it is no longer needed, because we are no longer overriding anything
|
|
puppet::puppetmaster::linux
provide a warning message if you have tried to specify $puppetmaster_ensure_version on an operatingsystem that is not supported
|
|
The preferences snippet requires that we set the package parameter to 'puppet*' to pull in the correct dependencies.
We set the priority to 2000 because according to apt_preferences(5):
P > 1000 causes a version to be installed even if this constitutes a downgrade of the package
which is the desired behavior.
This should resolve issue #2928
|
|
|
|
|
|
instead of touching .../restart.txt, which doen't seem to
work with libapache2-mod-passenger 2.2.11debian-2
|
|
|
|
Conflicts:
manifests/cron.pp
manifests/puppetmaster/package/debian.pp
|
|
|
|
|
|
|
|
$puppetmaster_ensure_version is not set
|
|
We'd like to use this variable in the 'puppet' class since we're
defining the path to another config file, there.
Since puppet::puppetmaster inherits the puppet class, the variable will
be defined appropriately. Just to make sure we get the value from the
right place, let's also use the qualified variable name.
To avoid useless repetitions in the variable name, change the variable
name from $puppet_default_config_dir to $default_config_dir.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
The puppet master has one additional config file that needs to be placed
in a different folder under FreeBSD.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
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
|
|
This reverts commit 0fd0df89f4a0bd0700b3260a4c40041c59f65660.
|
|
|
|
configurable
|
|
|
|
This should fix the remaining issues from
https://labs.riseup.net/code/issues/2928
|
|
|
|
version through puppetmaster_ensure_version (such as through backports)
|
|
removed for public use or incorporated into the puppet module"
This isn't something we want to keep
This reverts commit bc4fa29b454691b6c446b2881b4b3ea39d6b8272.
|
|
|
|
|
|
|
|
public use or incorporated into the puppet module
|
|
|
|
package diferences.
|
|
|
|
|
|
reports on a monthly basis (by default)
|
|
|
|
updating my previous commits with the fixes from LeLutin (closes: #2693)
|
|
/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
|
|
passenger mode
|
|
|
|
believe that this Closes #2353)
|
|
|
|
|
|
|
|
If we disable the cleanup of reports, actually remove the cron job.
|
|
|
