X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fscripts%2Fkoha-remove;h=3fa5ef167d58ce7583628f9972d019391b26c867;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=728f996e400fc362724f24c5ca292a37820f6a37;hpb=14c5540ab87519f750bac402974788dd4834d88f;p=koha.git

diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
index 728f996e40..3fa5ef167d 100755
--- a/debian/scripts/koha-remove
+++ b/debian/scripts/koha-remove
@@ -19,28 +19,81 @@
 
 set -e
 
+args=$(getopt -l keep-mysql -o k -n $0 -- "$@")
+eval set -- $args
+while [ ! -z "$1" ]
+do
+    case "$1" in
+         -k|--keep-mysql) keepmysql=1; shift;;
+         --) shift; break;;
+          *) break;;
+    esac
+    shift
+done
+
+NAMES="$@"
+
+SITECONFDIR="/etc/koha/sites"
+# There has to be a better way of excluding '.' from find. But this works.
+INSTANCES=`cd $SITECONFDIR && find . -type d -printf " %f" |sed s/\ .\ //`
 
-for name in "$@"
+if [ -z $NAMES ] ; then
+    echo "Please specify a Koha instance name. Your choices are:"
+    echo "$INSTANCES"
+    exit 1
+fi
+
+for name in $NAMES
 do
-    echo "Removing Koha instance $name"
+    # Does the directory (ie instance) name exist?
+    if [ ! -d $SITECONFDIR/$name ] ; then
+     echo Koha configuration directory for instance \"$name\" does not exist, please specify a valid Koha instance
+  exit 1
+    fi
 
-    mysql --defaults-extra-file=/etc/mysql/debian.cnf <<eof
-DROP USER 'koha_$name';
-DROP DATABASE koha_$name;
+    echo "Removing Koha instance $name"
+    mysql_hostname="localhost"
+    if [ "$keepmysql" != "1" ]
+    then
+    # The grant creates the user in case it isn't, we don't want our loop to fail if it has already being deleted.
+    mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <<eof
+GRANT USAGE ON \`koha_$name\`.* TO \`koha_$name\`@\`%\`;
+GRANT USAGE ON \`koha_$name\`.* TO \`koha_$name\`@\`$mysql_hostname\`;
+DROP USER \`koha_$name\`@\`%\`;
+DROP USER \`koha_$name\`@\`$mysql_hostname\`;
+DROP DATABASE IF EXISTS \`koha_$name\`;
 FLUSH PRIVILEGES;
 eof
+    fi #`
     
-    rm "/etc/apache2/sites-available/$name"
-    rm "/etc/koha/sites/$name/koha-conf.xml"
-    rm "/etc/koha/sites/$name/zebra-biblios.cfg"
-    rm "/etc/koha/sites/$name/zebra-authorities.cfg"
-    rm "/etc/koha/sites/$name/zebra-authorities-dom.cfg"
-    rmdir "/etc/koha/sites/$name"
-    rm -r "/var/lock/koha/$name"
-    rm -r "/var/log/koha/$name"
-    rm -r "/var/run/koha/$name"
-    deluser --quiet "$name-koha"
-    a2dissite "$name"
+    # If the daemon is not running already, we don't want to fail this loop. So bin the result code if this fails.
+    koha-stop-zebra $name || /bin/true
+    [ -f "/etc/apache2/sites-available/$name" ]  && \
+        rm "/etc/apache2/sites-available/$name"
+    [ -f "/etc/koha/sites/$name/koha-conf.xml" ] && \
+        rm "/etc/koha/sites/$name/koha-conf.xml"
+    [ -f "/etc/koha/sites/$name/zebra-biblios.cfg" ] && \
+        rm "/etc/koha/sites/$name/zebra-biblios.cfg"
+    [ -f "/etc/koha/sites/$name/zebra-biblios-dom.cfg" ] && \
+        rm "/etc/koha/sites/$name/zebra-biblios-dom.cfg"
+    [ -f "/etc/koha/sites/$name/zebra-authorities.cfg" ] && \
+        rm "/etc/koha/sites/$name/zebra-authorities.cfg"
+    [ -f "/etc/koha/sites/$name/zebra-authorities-dom.cfg" ] && \
+        rm "/etc/koha/sites/$name/zebra-authorities-dom.cfg"
+    [ -f "/etc/koha/sites/$name/zebra.passwd" ] && \
+        rm "/etc/koha/sites/$name/zebra.passwd"
+    # Maybe a user has left something in the config directory they want to keep? We won't delete it here, nor throw an error if the have.
+    [ -d "/etc/koha/sites/$name" ] && \
+        rmdir --ignore-fail-on-non-empty "/etc/koha/sites/$name"
+    [ -d "/var/lock/koha/$name" ] && \
+        rm -r "/var/lock/koha/$name"
+    [ -d "/var/log/koha/$name" ] && \
+        rm -r "/var/log/koha/$name"
+    [ -d "/var/run/koha/$name" ] && \
+        rm -r "/var/run/koha/$name"
+    getent passwd "$name-koha" > /dev/null && deluser --quiet "$name-koha"
+    # in case the site has already been disabled, we don't want to break the loop now.
+    a2dissite "$name" || /bin/true
 done
 
 service apache2 restart