Page MenuHomePhabricator
Paste P5620

(An Untitled Masterwork)
ActivePublic

Authored by Dzahn on Jun 23 2017, 1:03 AM.
Tags
None
Referenced Files
F8509506:
Jun 23 2017, 1:03 AM
Subscribers
None
9,10d8
< #
< # WMF version by Leslie Carr <lcarr@wikimedia.org>
24,25d21
< set -e
<
33,37c29,30
< NICENESS=0
< #Purge old resources before start
< ICINGAPUPPETFILES="/etc/icinga/puppet_hosts.cfg /etc/nagios/puppet_hostgroups.cfg /etc/nagios/puppet_servicegroups.cfg /etc/icinga/puppet_services.cfg"
< #NAGIOSPUPPETFILES="/etc/nagios/puppet_hosts.cfg /etc/nagios/puppet_hostgroups.cfg /etc/nagios/puppet_servicegroups.cfg /etc/nagios/puppet_checks.d/*"
< PURGESCRIPT="/usr/local/sbin/purge-nagios-resources.py"
---
> NICENESS=5
>
53a47,55
> check_run () {
> if [ ! -d '/var/run/icinga' ];
> then
> mkdir /var/run/icinga
> chown nagios:nagios /var/run/icinga
> chmod 0750 /var/run/icinga
> fi
> }
>
63c65
< check_cmd="/usr/lib/nagios/plugins/check_nagios /var/cache/icinga/status.dat 5 '/usr/sbin/icinga'"
---
> check_cmd="/usr/lib/nagios/plugins/check_nagios /var/lib/icinga/status.dat 5 '/usr/sbin/icinga'"
84a87,88
> CFG=$ICINGACFG
> test "$2" && CFG="$2"
90,91c94,98
< shift
< echo $*
---
> if [ -n "$1" ]
> then
> shift
> echo $*
> fi
129,132d135
<
< #clean up old files
< $PURGESCRIPT $ICINGAPUPPETFILES
<
135c138
< chown icinga:nagios $DIRECTORY
---
> chown nagios:nagios $DIRECTORY
169d171
< echo -n "."
172d173
< echo
217a219,220
>
> check_run