X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fconfig;h=d41c159077f068a8aa9aa3fe2be365b528133388;hb=refs%2Fheads%2Flenny;hp=e8c2d717c40e608c8e551a8a65347326886971eb;hpb=d03328f5a691130af6d00a90401854ec1dbca134;p=apache2-cn.git

diff --git a/debian/config b/debian/config
index e8c2d71..d41c159 100755
--- a/debian/config
+++ b/debian/config
@@ -5,6 +5,19 @@ set -e
 # Load debconf
 . /usr/share/debconf/confmodule
 
+if [ "$1" != reconfigure ]; then
+
+    apache2_done=1
+
+    db_fget apache2-cn/wwwhost seen
+    if [ "$RET" != "true" ]; then
+	apache2_done=0
+    fi
+
+    test $apache2_done -eq 1 && exit 0
+fi
+
+
 CONFDIR="/etc/apache2"
 CONF="$CONFDIR/apache2.conf"
 HOST=$(hostname)
@@ -37,12 +50,12 @@ done
 if [ $has_listen_ssl -eq 1 ]; then
 
 	# SSL configuration already exists - no need for SSL certificates.    
-	db_set apache2-cn/sslcf "X" || true
-	db_set apache2-cn/sslckf "X" || true
-	db_set apache2-cn/sslccf "X" || true
+	db_set apache2-cn/sslcf "" || true
+	db_set apache2-cn/sslckf "" || true
+	db_set apache2-cn/sslccf "" || true
 
 else
-    
+
 	# SSL certificates information..
 	SSLCF=1
 	while [ $SSLCF -eq 1 ]; do
@@ -114,10 +127,13 @@ fi
 
 
 # Use WWW VirtualHost?
+# - only during fresh install
 #
-db_subst apache2-cn/wwwhost stroj_domena "${HOST}.${DOMAIN}"
-db_subst apache2-cn/wwwhost www_domena "www.${DOMAIN}"
-db_input critical apache2-cn/wwwhost || true
-db_go || true
+if [ -z "$2" ]; then
+	db_subst apache2-cn/wwwhost stroj_domena "${HOST}.${DOMAIN}"
+	db_subst apache2-cn/wwwhost www_domena "www.${DOMAIN}"
+	db_input critical apache2-cn/wwwhost || true
+	db_go || true
+fi
 
 exit 0