[Pkg-nagios-changes] [pkg-pnp4nagios] 02/11: Fix Apache configuration handling

[Markus Frosch (old DM Account)]

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

lazyfrosch-guest pushed a commit to branch master
in repository pkg-pnp4nagios.

commit c37bcc468e3118733a5d212c9717f463697cba46
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Sun Oct 26 13:20:24 2014 +0100

    Fix Apache configuration handling
---
 debian/pnp4nagios-web-config-icinga.postinst  | 6 +++---
 debian/pnp4nagios-web-config-nagios3.postinst | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/pnp4nagios-web-config-icinga.postinst b/debian/pnp4nagios-web-config-icinga.postinst
index a29528d..cc921ca 100644
--- a/debian/pnp4nagios-web-config-icinga.postinst
+++ b/debian/pnp4nagios-web-config-icinga.postinst
@@ -27,8 +27,8 @@ case "$1" in
         if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
             . /usr/share/apache2/apache2-maintscript-helper
 
-            apache2_invoke enconf rewrite
-            apache2_invoke enconf pnp4nagios-web
+            apache2_invoke enmod rewrite
+            apache2_invoke enconf pnp4nagios
 
             # remove OLD Apache 2.2 link
             [ -L /etc/apache2/conf.d/pnp4nagios-web.conf ] && rm /etc/apache2/conf.d/pnp4nagios-web.conf
@@ -39,7 +39,7 @@ case "$1" in
             [ -f /etc/apache2/mods-enabled/rewrite.load ] || a2enmod rewrite
 
             # create symlink if not existing
-            [ -f /etc/apache2/conf.d/pnp4nagios-web.conf ] || ln -vs ../conf-available/pnp4nagios-web.conf /etc/apache2/conf.d/pnp4nagios-web.conf
+            [ -f /etc/apache2/conf.d/pnp4nagios.conf ] || ln -vs ../conf-available/pnp4nagios.conf /etc/apache2/conf.d/pnp4nagios.conf
 
             # reload webserver
             [ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload
diff --git a/debian/pnp4nagios-web-config-nagios3.postinst b/debian/pnp4nagios-web-config-nagios3.postinst
index be85026..ed0aa5d 100644
--- a/debian/pnp4nagios-web-config-nagios3.postinst
+++ b/debian/pnp4nagios-web-config-nagios3.postinst
@@ -27,8 +27,8 @@ case "$1" in
         if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
             . /usr/share/apache2/apache2-maintscript-helper
 
-            apache2_invoke enconf rewrite
-            apache2_invoke enconf pnp4nagios-web
+            apache2_invoke enmod rewrite
+            apache2_invoke enconf pnp4nagios
 
             # remove OLD Apache 2.2 link
             [ -L /etc/apache2/conf.d/pnp4nagios-web.conf ] && rm /etc/apache2/conf.d/pnp4nagios-web.conf
@@ -39,7 +39,7 @@ case "$1" in
             [ -f /etc/apache2/mods-enabled/rewrite.load ] || a2enmod rewrite
 
             # create symlink if not existing
-            [ -f /etc/apache2/conf.d/pnp4nagios-web.conf ] || ln -vs ../conf-available/pnp4nagios-web.conf /etc/apache2/conf.d/pnp4nagios-web.conf
+            [ -f /etc/apache2/conf.d/pnp4nagios.conf ] || ln -vs ../conf-available/pnp4nagios.conf /etc/apache2/conf.d/pnp4nagios.conf
 
             # reload webserver
             [ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload

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