[Pkg-nagios-changes] [pkg-check-mk] 01/01: fix if, improve comment

Matt Taggart taggart at moszumanska.debian.org
Wed Jun 24 22:55:29 UTC 2015


This is an automated email from the git hooks/post-receive script.

taggart pushed a commit to branch master
in repository pkg-check-mk.

commit ed3cf4696208d40169c6944cd22b77ab87b30e0b
Author: Matt Taggart <taggart at riseup.net>
Date:   Wed Jun 24 15:56:09 2015 -0700

    fix if, improve comment
---
 debian/check-mk-config-icinga.postinst  | 3 ++-
 debian/check-mk-config-nagios3.postinst | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/check-mk-config-icinga.postinst b/debian/check-mk-config-icinga.postinst
index 3e8ccbf..4f1d68e 100644
--- a/debian/check-mk-config-icinga.postinst
+++ b/debian/check-mk-config-icinga.postinst
@@ -61,8 +61,9 @@ case "$1" in
                         if [ -d /etc/apache2/conf.d/ ]; then
                                 if [ -L /etc/apache2/conf.d/$CONF.conf ]; then
                                         # it's a symlink, all is well
+                                        /bin/true
                                 elif [ -e /etc/apache2/conf.d/$CONF.conf ]; then
-                                        # it's not a symlink, error
+                                        # it's not a symlink, but exists, error
                                         echo "ERROR: /etc/apache2/conf.d/$CONF.conf is not a symlink, please investigate" 1>&2
                                 else
                                         # we need to create the symlink
diff --git a/debian/check-mk-config-nagios3.postinst b/debian/check-mk-config-nagios3.postinst
index a3a0e1e..f45644d 100644
--- a/debian/check-mk-config-nagios3.postinst
+++ b/debian/check-mk-config-nagios3.postinst
@@ -61,8 +61,9 @@ case "$1" in
                         if [ -d /etc/apache2/conf.d/ ]; then
                                 if [ -L /etc/apache2/conf.d/$CONF.conf ]; then
                                         # it's a symlink, all is well
+                                        /bin/true
                                 elif [ -e /etc/apache2/conf.d/$CONF.conf ]; then
-                                        # it's not a symlink, error
+                                        # it's not a symlink, but exists, error
                                         echo "ERROR: /etc/apache2/conf.d/$CONF.conf is not a symlink, please investigate" 1>&2
                                 else
                                         # we need to create the symlink

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-check-mk.git



More information about the Pkg-nagios-changes mailing list