Hello community,
here is the log from the commit of package nagios-theme-switcher for
openSUSE:Factory checked in at 2014-06-05 10:50:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nagios-theme-switcher (Old)
and /work/SRC/openSUSE:Factory/.nagios-theme-switcher.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios-theme-switcher"
Changes:
--------
---
/work/SRC/openSUSE:Factory/nagios-theme-switcher/nagios-theme-switcher.changes
2014-03-15 17:37:02.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.nagios-theme-switcher.new/nagios-theme-switcher.changes
2014-06-05 10:50:07.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 4 08:03:08 UTC 2014 - [email protected]
+
+- Update to 1.3:
+ + use systemctl on newer distributions
+ + run apache try-restart instead of restart
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nagios-theme-switcher.spec ++++++
--- /var/tmp/diff_new_pack.BeOF0s/_old 2014-06-05 10:50:09.000000000 +0200
+++ /var/tmp/diff_new_pack.BeOF0s/_new 2014-06-05 10:50:09.000000000 +0200
@@ -1,6 +1,7 @@
#
# spec file for package nagios-theme-switcher
#
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 by Lars Vogdt
#
# All modifications and additions to the file contributed by third parties
@@ -12,14 +13,17 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
Name: nagios-theme-switcher
-Version: 1.2
-Release: 1
-License: BSD-3-Clause
+Version: 1.3
+Release: 0
Summary: Simple Theme Switcher for Nagios Webfrontend
-Url: http://en.opensuse.org/nagios-theme-switcher
+License: BSD-3-Clause
Group: System/Monitoring
+Url: http://en.opensuse.org/nagios-theme-switcher
Source0: switch-nagios-theme
Source1: switch-nagios-theme.8
%if 0%{?suse_version}
++++++ switch-nagios-theme ++++++
--- /var/tmp/diff_new_pack.BeOF0s/_old 2014-06-05 10:50:09.000000000 +0200
+++ /var/tmp/diff_new_pack.BeOF0s/_new 2014-06-05 10:50:09.000000000 +0200
@@ -37,6 +37,7 @@
DEFAULT_THEME='nagios'
BACKUP_DIR="$THEME_DIR/backups"
APACHECTL='/etc/init.d/apache2'
+SYSTEMCTL='/usr/bin/systemctl'
DO_ECHO=''
function usage() {
@@ -159,8 +160,10 @@
fi
if [ ! -x "$APACHECTL" ]; then
- echo "ERROR: Could not execute $APACHECTL" >&2
- ERROR=1
+ if [ ! -x "$SYSTEMCTL" ]; then
+ echo "ERROR: Can not restart apache2 - neither $APACHECTL nor
$SYSTEMCTL are available" >&2
+ ERROR=1
+ fi
fi
if [ -n "$ERROR" ]; then
@@ -179,4 +182,9 @@
$DO_ECHO sed -i "s|^Alias.*/nagios.*$CURRENT_THEME.*|Alias /nagios
\"$NEW_THEME\"|; \
s|<Directory.*$CURRENT_THEME.*|<Directory \"$NEW_THEME\">|"
"$APACHE_CONFIG"
-$DO_ECHO $APACHECTL restart
+if [ -x $APACHECTL ]; then
+ $DO_ECHO $APACHECTL try-restart
+elif [ -x $SYSTEMCTL ]; then
+ $DO_ECHO $SYSTEMCTL try-restart apache2
+fi
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
