From 2e9a859a0726c8f95141dab413dafe290f68440b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@anarcat.ath.cx>
Date: Tue, 7 Oct 2008 16:42:40 +0000
Subject: [PATCH] fix apache2 and apache-ssl configuration

Closes: #1017
---
 debian/alternc-slave.postinst | 14 +++++++-------
 debian/alternc.postinst       | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/alternc-slave.postinst b/debian/alternc-slave.postinst
index 62aff9a7..9c447d79 100644
--- a/debian/alternc-slave.postinst
+++ b/debian/alternc-slave.postinst
@@ -168,29 +168,29 @@ EOF
     alternc.install
 
     if [ -x /usr/sbin/apache ]; then
-        if [ ! -h /etc/apache-ssl/conf.d/alternc.conf ]; then
+        if [ ! -h /etc/apache-ssl/conf.d/alternc.conf ] && [ -e /etc/apache-ssl/conf.d/ ]; then
             ln -sf /etc/alternc/apache-ssl.conf \
                 /etc/apache-ssl/conf.d/alternc.conf
         fi
 
-        if [ ! -h /etc/apache/conf.d/alternc.conf ]; then
+        if [ ! -h /etc/apache/conf.d/alternc.conf ] && [ -e /etc/apache/conf.d/ ]; then
             ln -sf /etc/alternc/apache.conf \
                 /etc/apache/conf.d/alternc.conf
         fi
 
-        if [ ! -h /etc/apache/conf.d/override_php.conf ]; then
+        if [ ! -h /etc/apache/conf.d/override_php.conf ] && [ -e /etc/apache/conf.d/ ]; then
             ln -sf /var/alternc/apacheconf/override_php.conf \
                 /etc/apache/conf.d/override_php.conf
         fi
     fi
     if [ -x /usr/sbin/apache2 ]; then
-        if [ ! -h /etc/apache2/conf.d/alternc.conf ]; then
+        if [ ! -h /etc/apache2/conf.d/alternc.conf ] && [ -e /etc/apache2/conf.d/ ]; then
             ln -sf /etc/alternc/apache.conf \
-                /etc/apache/conf.d/alternc.conf
+                /etc/apache2/conf.d/alternc.conf
         fi
-        if [ ! -h /etc/apache2/conf.d/override_php.conf ]; then
+        if [ ! -h /etc/apache2/conf.d/override_php.conf ] && [ -e /etc/apache2/conf.d/ ]; then
             ln -sf /var/alternc/apacheconf/override_php.conf \
-                /etc/apache/conf.d/override_php.conf
+                /etc/apache2/conf.d/override_php.conf
         fi
 
     fi 
diff --git a/debian/alternc.postinst b/debian/alternc.postinst
index 8df93b75..d63c6eb6 100644
--- a/debian/alternc.postinst
+++ b/debian/alternc.postinst
@@ -200,29 +200,29 @@ EOF
     /usr/lib/alternc/basedir_prot.sh
 
     if [ -x /usr/sbin/apache ]; then
-        if [ ! -h /etc/apache-ssl/conf.d/alternc.conf ]; then
+        if [ ! -h /etc/apache-ssl/conf.d/alternc.conf ] && [ -e /etc/apache-ssl/conf.d/ ]; then
             ln -sf /etc/alternc/apache-ssl.conf \
                 /etc/apache-ssl/conf.d/alternc.conf
         fi
 
-        if [ ! -h /etc/apache/conf.d/alternc.conf ]; then
+        if [ ! -h /etc/apache/conf.d/alternc.conf ] && [ -e /etc/apache/conf.d/ ]; then
             ln -sf /etc/alternc/apache.conf \
                 /etc/apache/conf.d/alternc.conf
         fi
 
-        if [ ! -h /etc/apache/conf.d/override_php.conf ]; then
+        if [ ! -h /etc/apache/conf.d/override_php.conf ] && [ -e /etc/apache/conf.d/ ]; then
             ln -sf /var/alternc/apacheconf/override_php.conf \
                 /etc/apache/conf.d/override_php.conf
         fi
     fi
     if [ -x /usr/sbin/apache2 ]; then
-        if [ ! -h /etc/apache2/conf.d/alternc.conf ]; then
+        if [ ! -h /etc/apache2/conf.d/alternc.conf ] && [ -e /etc/apache2/conf.d/ ]; then
             ln -sf /etc/alternc/apache.conf \
-                /etc/apache/conf.d/alternc.conf
+                /etc/apache2/conf.d/alternc.conf
         fi
-        if [ ! -h /etc/apache2/conf.d/override_php.conf ]; then
+        if [ ! -h /etc/apache2/conf.d/override_php.conf ] && [ -e /etc/apache2/conf.d/ ]; then
             ln -sf /var/alternc/apacheconf/override_php.conf \
-                /etc/apache/conf.d/override_php.conf
+                /etc/apache2/conf.d/override_php.conf
         fi
 
     fi