[Pkg-citadel-commit] r239 - webcit/trunk/debian

[meskes at alioth.debian.org]

Author: meskes
Date: 2009-03-01 12:56:25 +0000 (Sun, 01 Mar 2009)
New Revision: 239

Modified:
   webcit/trunk/debian/citadel-webcit.postinst
Log:
Back to old style of writing /etc/default/webcit to allow more variable
settings in there.



Modified: webcit/trunk/debian/citadel-webcit.postinst
===================================================================
--- webcit/trunk/debian/citadel-webcit.postinst	2009-03-01 12:01:12 UTC (rev 238)
+++ webcit/trunk/debian/citadel-webcit.postinst	2009-03-01 12:56:25 UTC (rev 239)
@@ -17,27 +17,26 @@
 	if test -e /etc/default/webcit; then
                 . /etc/default/webcit
 	else
-                WEBCIT_CITADEL_IP=127.0.0.1
-                WEBCIT_CITADEL_PORT=504
+                export WEBCIT_CITADEL_IP=127.0.0.1
+                export WEBCIT_CITADEL_PORT=504
 	fi
 
 	db_get citadel/WebcitApacheIntegration && WWWTYPE="$RET"
 	if test "$WWWTYPE" = "Internal"; then
-		echo 'export WEBCIT_APACHEFLAG=" "' > /etc/default/webcit
-		echo "export WEBCIT_LISTEN_IP=${WEBCIT_LISTEN_IP:-0.0.0.0}" >> /etc/default/webcit
+		export WEBCIT_APACHEFLAG=" "
+		export WEBCIT_LISTEN_IP=${WEBCIT_LISTEN_IP:-0.0.0.0}
 	else
-		echo 'export WEBCIT_APACHEFLAG="-f"' > /etc/default/webcit
-		echo "export WEBCIT_LISTEN_IP=${WEBCIT_LISTEN_IP:-127.0.0.1}" >> /etc/default/webcit
+		export WEBCIT_APACHEFLAG="-f"
+		export WEBCIT_LISTEN_IP=${WEBCIT_LISTEN_IP:-127.0.0.1}
 	fi
 	
-	db_get citadel/WebcitHttpPort && echo "export WEBCIT_HTTP_PORT=$RET" >> /etc/default/webcit
-	db_get citadel/WebcitHttpsPort && echo "export WEBCIT_HTTPS_PORT=$RET" >> /etc/default/webcit
-	db_get citadel/WebcitOfferLang && echo "export WEBCIT_LANG=$RET" >> /etc/default/webcit
-	
-	echo "export WEBCIT_CITADEL_PORT=$WEBCIT_CITADEL_PORT" >> /etc/default/webcit
-	echo "export WEBCIT_CITADEL_IP=$WEBCIT_CITADEL_IP" >> /etc/default/webcit
+	db_get citadel/WebcitHttpPort && export WEBCIT_HTTP_PORT=$RET
+	db_get citadel/WebcitHttpsPort && export WEBCIT_HTTPS_PORT=$RET
+	db_get citadel/WebcitOfferLang && export WEBCIT_LANG=$RET
 
 	db_stop
+	
+	set |grep WEBCIT |sed "s;^;export ;;" >/etc/default/webcit
 
 	#DEBHELPER#