[icinga-checkins] icinga.org: icinga-core/r1.7: icinga.spec: forced update on icinga. cfg change package locations; update to 1.7.2

git at icinga.org git at icinga.org
Tue Aug 21 18:15:20 CEST 2012


Module: icinga-core
Branch: r1.7
Commit: 4790f76ce3f3f5e1bb2bf5f6c4deecd671c67894
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=4790f76ce3f3f5e1bb2bf5f6c4deecd671c67894

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Jul 31 20:30:04 2012 +0200

icinga.spec: forced update on icinga.cfg change package locations; update to 1.7.2

refs #2923

Conflicts:

	Changelog
	icinga.spec

---

 Changelog   |    2 ++
 icinga.spec |   23 ++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 1142b8b..c9c4f1d 100644
--- a/Changelog
+++ b/Changelog
@@ -24,6 +24,8 @@ FIXES
 * idoutils: fix icinga mysql db creation script grants access to all dbs #2917 - MF
 * idoutils: fix ignoring mysql password in create_mysqldb.sh #2994 - MF
 
+* icinga.spec: forced update on icinga.cfg change package locations #2923 -MF
+
 CHANGES
 
 
diff --git a/icinga.spec b/icinga.spec
index 858c940..865f07c 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -20,7 +20,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.7.1
+Version: 1.7.2
 Release: %{revision}%{?dist}
 License: GPLv2
 Group: Applications/System
@@ -205,6 +205,20 @@ then
     cp /var/icinga/objects.precache %{spooldir}/objects.precache
     rm /var/icinga/objects.precache
 fi
+
+# we must then check all changed config locations (and we enforce that change to icinga.cfg only once)
+# cgi.cfg luckily knows where icinga.cfg is and does not need an update
+# retention.dat, objects.cache, objects.precache, status.dat, cmdfile, pidfile, checkresults
+%{__perl} -pi -e '
+        s|/var/icinga/retention.dat|%{spooldir}/retention.dat|;
+        s|/var/icinga/objects.precache|%{spooldir}/objects.precache|;
+        s|/var/icinga/objects.cache|%{spooldir}/objects.cache|;
+        s|/var/icinga/status.dat|%{spooldir}/status.dat|;
+        s|/var/icinga/rw/icinga.cmd|%{spooldir}/cmd/icinga.cmd|;
+        s|/var/icinga/icinga.pid|/var/run/icinga.pid|;
+	s|/var/icinga/checkresults|%{spooldir}/checkresults|;
+   ' /etc/icinga/icinga.cfg
+
 # start icinga
 /sbin/service icinga start &>/dev/null || :
 fi
@@ -382,6 +396,13 @@ fi
 
 
 %changelog
+* Tue Aug 21 2012 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.7.2-1
+- bump version
+- forgot to check on old icinga.cfg entries not matching - enforce that once
+
+* Mon Jun 18 2012 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.7.1-1
+- bump to 1.7.1
+
 * Sun May 06 2012 Michael Friedrich <michael.friedrich at univie.ac.at> - 1.7.0-1
 - drop idoutils, add idoutils-libdbi-mysql and idoutils-libdbi-pgsql
 - add requires for libdbi drivers mysql and pgsql





More information about the icinga-checkins mailing list