X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdebian%2Fcitadel-webcit.postinst;h=fcc3a08b23f53cb0f8fb88bd4865a8f9f6e580fc;hb=1cb8a277add83b4e21bd4c2fbe65c2649b4b7089;hp=e836598d5014a100d1d394cfddcde1b0344caf9e;hpb=b1f791fd375faf4665cae73acba7a9246d053035;p=citadel.git

diff --git a/webcit/debian/citadel-webcit.postinst b/webcit/debian/citadel-webcit.postinst
index e836598d5..fcc3a08b2 100644
--- a/webcit/debian/citadel-webcit.postinst
+++ b/webcit/debian/citadel-webcit.postinst
@@ -16,31 +16,22 @@ case "$1" in
 
 	db_get citadel/WebcitApacheIntegration &&WWWTYPE="$RET"
 	db_stop
-# Hack: make webcit use gnome icons. roll your own if wanted.
-	if test ! -L /usr/share/citadel-webcit/static/icons; then
-	    ln -sf /usr/share/icons/gnome/24x24/mimetypes  /usr/share/citadel-webcit/static/icons || true
-	fi
+
 	#DEBHELPER#
-	if test ! -L /usr/share/citadel-webcit/static/; then
-	    if test -d /usr/share/prototypejs; then 
-		ln -sf /usr/share/prototypejs/prototype.js /usr/share/citadel-webcit/static/	
-	    else
-		ln -sf /usr/share/javascript/prototype/prototype.js /usr/share/citadel-webcit/static/	
-	    fi
-	fi
+	
 # update the webserver, if needed
 	case "$WWWTYPE" in
 	    "Apache")
 		webservers="apache" 
-		/usr/sbin/aenmod proxy||true
+		aenmod proxy||true
 		;;
 	    "Apache-SSL")
 		webservers="apache-ssl" 
 		;;
 	    "Apache2")
 		webservers="apache2"
-		/usr/sbin/a2enmod proxy||true
-		/usr/sbin/a2enmod proxy_http||true
+		a2enmod proxy||true
+		a2enmod proxy_http||true
 		;;
 	    "All")
 		webservers="apache apache-ssl apache2" 
@@ -51,7 +42,7 @@ case "$1" in
 	esac
 	for server in $webservers; do
 	    if [ -d "/etc/${server}/conf.d" ]; then
-		if [ ! -e "/etc/${server}/conf.d/webcit-citadel" ] ; then
+		if [ ! -e "/etc/${server}/conf.d/webcit.conf" ] ; then
 		    ln -sf /etc/citadel/webcit.conf "/etc/${server}/conf.d/webcit.conf"
                 fi
                 invoke-rc.d $server reload || true