Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/316571

Change subject: icinga: Amend init script
......................................................................

icinga: Amend init script

Use the new paths in the ICINGAPUPPETFILES variable in the icinga init
script

As to why we ship our own init script, for now at least, this eludes me

Change-Id: I319348cac6083fa7cb3e4d21a1e16c6abe6493d2
---
M modules/icinga/files/icinga-init
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/316571/1

diff --git a/modules/icinga/files/icinga-init b/modules/icinga/files/icinga-init
index 2834acc..bfa0d87 100755
--- a/modules/icinga/files/icinga-init
+++ b/modules/icinga/files/icinga-init
@@ -32,7 +32,7 @@
 CGICFG="/etc/icinga/cgi.cfg"
 NICENESS=0
 #Purge old resources before start
-ICINGAPUPPETFILES="/etc/icinga/puppet_hosts.cfg 
/etc/icinga/puppet_hostgroups.cfg /etc/icinga/puppet_hostextinfo.cfg 
/etc/icinga/puppet_servicegroups.cfg /etc/icinga/puppet_services.cfg" 
+ICINGAPUPPETFILES="/etc/icinga/puppet_hosts.cfg 
/etc/nagios/puppet_hostgroups.cfg /etc/icinga/puppet_hostextinfo.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"
 [ -x "$DAEMON" ] || exit 0

-- 
To view, visit https://gerrit.wikimedia.org/r/316571
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I319348cac6083fa7cb3e4d21a1e16c6abe6493d2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to