* use the debian prototypejs package

[citadel.git] / webcit / debian / citadel-webcit.postinst

diff --git a/webcit/debian/citadel-webcit.postinst b/webcit/debian/citadel-webcit.postinst
index bec157359f458bc3bf817f6e8b03fb458fdbd533..63d6bf9abeb1d43bfb8830f95ca08c69d9fbb8a9 100644 (file)
--- a/webcit/debian/citadel-webcit.postinst
+++ b/webcit/debian/citadel-webcit.postinst
@@ -16,21 +16,27 @@ 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
+           ln -sf /usr/share/prototypejs/prototype.js /usr/share/citadel-webcit/static/        
+       fi
 # update the webserver, if needed
        case "$WWWTYPE" in
            "Apache")
                webservers="apache" 
-               aenmod proxy
+               /usr/sbin/aenmod proxy||true
                ;;
            "Apache-SSL")
                webservers="apache-ssl" 
                ;;
            "Apache2")
                webservers="apache2"
-               a2enmod proxy
+               /usr/sbin/a2enmod proxy||true
+               /usr/sbin/a2enmod proxy_http||true
                ;;
            "All")
                webservers="apache apache-ssl apache2" 
@@ -39,16 +45,14 @@ case "$1" in
                webservers="" 
                ;;
        esac
-
        for server in $webservers; do
            if [ -d "/etc/${server}/conf.d" ]; then
                if [ ! -e "/etc/${server}/conf.d/webcit-citadel" ] ; then
-                   ln -s /etc/citadel/apache.conf "/etc/${server}/conf.d/webcit.conf"
+                   ln -sf /etc/citadel/webcit.conf "/etc/${server}/conf.d/webcit.conf"
                 fi
                 invoke-rc.d $server reload || true
            fi
        done
-
     ;;
   abort-upgrade|abort-remove|abort-deconfigure)
     ;;