From 03038d18dd6b811178901e515512b7c0917d5d01 Mon Sep 17 00:00:00 2001
From: Pierre Gilles Mialon <pierre-gilles@netaktiv.com>
Date: Fri, 5 Oct 2007 14:31:05 +0000
Subject: [PATCH] Suppress an  usueless restart of apache in dopo.sh This chek
 is althought apache 1.3 dependent.

Modify the check before enabling the modules for apache2. Now it show be possible to perform an aptitude install apache2 php5 alternc ...

I hope :)
---
 install/alternc.install | 2 +-
 install/dopo.sh         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/alternc.install b/install/alternc.install
index 25359b7c..86ac1af6 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -192,7 +192,7 @@ then
     echo "LoadModule ${php}_module /usr/lib/apache/1.3/lib${php}.so" | append_no_dupe /etc/apache-ssl/modules.conf
     SERVICES="$SERVICES apache apache-ssl"
 fi
-if [ -x /usr/sbin/apache2 ]
+if [ -x /usr/sbin/apache2 ] &&  ! ( [ -L /etc/apache2/mods-enabled/vhost_alias.load ] && [ -L /etc/apache2/mods-enabled/$php.load ] )
 then
     a2enmod vhost_alias
     a2enmod $php
diff --git a/install/dopo.sh b/install/dopo.sh
index a5cd64ef..9181ec01 100755
--- a/install/dopo.sh
+++ b/install/dopo.sh
@@ -39,7 +39,7 @@ dolangs() {
 find /var/alternc/bureau/locales -maxdepth 1 -mindepth 1 -type d -name "*_*" | dolangs
 
 # Relance les apache pour qu'ils vident leur cache GetText
-invoke-rc.d apache restart
-invoke-rc.d apache-ssl restart
+# invoke-rc.d apache restart
+# invoke-rc.d apache-ssl restart
 
 exit 0