Fixes for the installing/cleanup

maharadocs-1.7/debian/maharadocs.config

@@ -4,6 +4,8 @@ set -e
 
 db_input high maharadocs/installdir || true
 db_go
+db_input high maharadocs/logdir || true
+db_go
 db_input high maharadocs/giturl || true
 db_go
 db_input high maharadocs/overwrite || true

maharadocs-1.7/debian/maharadocs.postinst

@@ -13,7 +13,7 @@ case "$1" in
         	db_get maharadocs/giturl
 		GITURL=$RET
         	db_get maharadocs/logdir
-		OVERWRITEDIR=$RET
+		LOGDIR=$RET
         	db_get maharadocs/overwrite
 		OVERWRITEDIR=$RET
 	;;

maharadocs-1.7/debian/maharadocs.postrm

@@ -21,15 +21,17 @@ set -e
 
 
 case "$1" in
-    upgrade)
+    purge|upgrade)
     ;;
 
-    purge|remove|failed-upgrade|abort-install|abort-upgrade|disappear)
+    remove|failed-upgrade|abort-install|abort-upgrade|disappear)
                 db_get maharadocs/installdir
                 DIRNAME=$RET
-                if [$DIRNAME !eq '/'];
-                    rm -rf $DIRNAME
-                fi
+                echo "Disabling apache site config"
+                a2dissite mahara-manual-sphinx.conf
+                echo "Removing apache site config"
+                rm -f /etc/apache2/sites-available/mahara-manual-sphinx.conf
+                echo "NOTE: The directory $DIRNAME has not been removed and must be deleted manually!"
     ;;
 
     *)

maharadocs-1.7/debian/maharadocs.templates

@@ -9,7 +9,7 @@ Description: Installation directory:
 Template: maharadocs/logdir
 Type: string
 Default: /var/log/sitelogs/mahara-manual-sphinx
-Description: Installation directory:
+Description: Apache access/error logs directory:
  What directory should the apache sitelogs for the manual be
  put in? This directory should not exist when installing
  for the first time.