From dc8c4de66b84cbbe1350b91dae6b142f194047b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@anarcat.ath.cx>
Date: Fri, 7 Sep 2007 19:38:02 +0000
Subject: [PATCH] re-establish apache-modconf as means of enabling vhost_alias
 and php modules, don't talk to ucf Closes: #1062

---
 install/alternc.install | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/install/alternc.install b/install/alternc.install
index f4784a0d..5e203816 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -180,25 +180,9 @@ touch /var/run/alternc/refresh_slave
 touch /var/alternc/apacheconf/override_php.conf
 # Enable vhost_alias apache module at the right place (ie: BEFORE mod_alias, but apache knows this ... )
 # well, apache-modconf works like crap in a shell script ...
-# apache-modconf apache enable mod_vhost_alias quiet </dev/null || true
-# apache-modconf apache enable `dpkg -l libapache-mod-php*|grep ii | cut -f 3 -d ' '|cut -b 11-18|sed -e 's/-/_/'` quiet </dev/null|| true
-if ! grep -q "vhost_alias_module" /etc/apache/modules.conf 
-then
-    mv /etc/apache/modules.conf /etc/apache/modules.conf.alternc-dist
-    cat /etc/apache/modules.conf.alternc-dist | sed -e 's/LoadModule config_log_module/LoadModule vhost_alias_module \/usr\/lib\/apache\/1.3\/mod_vhost_alias.so\nLoadModule config_log_module/'   > /etc/apache/modules.conf
-    rm /etc/apache/modules.conf.alternc-dist
-fi
-if ! grep -q "php5_module" /etc/apache/modules.conf 
-then
-    echo "LoadModule php5_module /usr/lib/apache/1.3/libphp5.so" >>/etc/apache/modules.conf
-fi
-if ! grep -q "php5_module" /etc/apache-ssl/modules.conf 
-then
-    echo "LoadModule php5_module /usr/lib/apache/1.3/libphp5.so" >>/etc/apache-ssl/modules.conf
-fi
-# We update ucf, that's bad isn't it ? ;) 
-ucf /etc/apache/modules.conf /etc/apache/modules.conf
-ucf /etc/apache-ssl/modules.conf /etc/apache-ssl/modules.conf
+apache-modconf apache enable mod_vhost_alias quiet </dev/null || true
+apache-modconf apache enable `dpkg -l libapache-mod-php*|grep ii | cut -f 3 -d ' '|cut -b 11-18|sed -e 's/-/_/'` quiet </dev/null|| true
+apache-modconf apache-ssl enable `dpkg -l libapache-mod-php*|grep ii | cut -f 3 -d ' '|cut -b 11-18|sed -e 's/-/_/'` quiet </dev/null|| true
 
 # Copy postfix *_checks if they do not exist
 for file in body_checks header_checks; do