X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=debian%2Fscripts%2Fkoha-stop-zebra;h=e6aae7d10d1672f4496894f9a69be8e22217ac12;hb=63d61e7c50ec81588effd2307339bd53242536f1;hp=e60f2b37896eafef4908b3cd31238678e2b00843;hpb=049313debd316bb7dad362e6924ed1649fd7d6b7;p=koha.git

diff --git a/debian/scripts/koha-stop-zebra b/debian/scripts/koha-stop-zebra
index e60f2b3789..e6aae7d10d 100755
--- a/debian/scripts/koha-stop-zebra
+++ b/debian/scripts/koha-stop-zebra
@@ -18,83 +18,36 @@
 
 set -e
 
-die()
-{
-    echo "$@" 1>&2
+# include helper functions
+if [ -f "/usr/share/koha/bin/koha-functions.sh" ]; then
+    . "/usr/share/koha/bin/koha-functions.sh"
+else
+    echo "Error: /usr/share/koha/bin/koha-functions.sh not present." 1>&2
     exit 1
-}
-
-warn()
-{
-    echo "$@" 1>&2
-}
-
-is_enabled()
-{
-    local instancename=$1
-
-    if ! is_instance $instancename; then
-        return 1
-    fi
-
-    if grep -q '^[[:space:]]*Include /etc/koha/apache-shared-disable.conf' \
-            "/etc/apache2/sites-available/$instancename" ; then
-        return 1
-    else
-        return 0
-    fi
-}
-
-is_instance()
-{
-    local instancename=$1
-
-    if find /etc/koha/sites -mindepth 1 -maxdepth 1 \
-                         -type d -printf '%f\n'\
-          | grep -q -x $instancename ; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-is_zebra_running()
-{
-    local instancename=$1
-
-    if daemon --name="$instancename-koha-zebra" \
-            --user="$instancename-koha.$instancename-koha" \
-            --running ; then
-        return 0
-    else
-        return 1
-    fi
-}
+fi
 
 stop_zebra_instance()
 {
     local instancename=$1
 
-    if is_zebra_running $instancename; then
-        echo "Stopping Zebra server for $instancename"
-        daemon \
-            --name="$instancename-koha-zebra" \
-            --errlog="/var/log/koha/$instancename/zebra-error.log" \
-            --stdout="/var/log/koha/$instancename/zebra.log" \
-            --output="/var/log/koha/$instancename/zebra-output.log" \
-            --verbose=1 \
-            --respawn \
-            --delay=30 \
-            --user="$instancename-koha.$instancename-koha" \
-            --stop \
-            -- \
-            zebrasrv \
-            -v none,fatal,warn \
-            -f "/etc/koha/sites/$instancename/koha-conf.xml" && \
-        return 0
-    else
+    echo "Stopping Zebra server for $instancename"
+    daemon \
+        --name="$instancename-koha-zebra" \
+        --pidfiles="/var/run/koha/$instancename/" \
+        --errlog="/var/log/koha/$instancename/zebra-error.log" \
+        --stdout="/var/log/koha/$instancename/zebra.log" \
+        --output="/var/log/koha/$instancename/zebra-output.log" \
+        --verbose=1 \
+        --respawn \
+        --delay=30 \
+        --user="$instancename-koha.$instancename-koha" \
+        --stop \
+        -- \
+        zebrasrv \
+        -v none,fatal,warn \
+        -f "/etc/koha/sites/$instancename/koha-conf.xml" && \
+        return 0 || \
         return 1
-    fi
 }
 
 usage()
@@ -115,16 +68,12 @@ EOF
 for name in "$@"
 do
     if is_instance $name ; then
-        if is_enabled $name ; then
-            if is_zebra_running $name; then
-                if ! stop_zebra_instance $name; then
-                    warn "Something went wrong stopping Zebra for $name."
-                fi
-            else
-                warn "Zebra already stopped for instance $name."
+        if is_zebra_running $name; then
+            if ! stop_zebra_instance $name; then
+                warn "Something went wrong stopping Zebra for $name."
             fi
         else
-            warn "Instance $name disabled. No action taken."
+            warn "Zebra already stopped for instance $name."
         fi
     else
         warn "Unknown instance $name."