Some extra kills when removing gnusocial/postactiv

This commit is contained in:
Bob Mottram 2018-05-08 22:34:59 +01:00
parent 7345b7b629
commit 4321313922
2 changed files with 2 additions and 0 deletions

View File

@ -581,6 +581,7 @@ function remove_gnusocial {
fi fi
kill_pid=$(pgrep "/var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/queuedaemon.php" | head -n 1) kill_pid=$(pgrep "/var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/queuedaemon.php" | head -n 1)
kill -9 "$kill_pid" kill -9 "$kill_pid"
pkill "$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/queuedaemon.php"
if [ -d "/var/www/$GNUSOCIAL_DOMAIN_NAME" ]; then if [ -d "/var/www/$GNUSOCIAL_DOMAIN_NAME" ]; then
rm -rf "/var/www/$GNUSOCIAL_DOMAIN_NAME" rm -rf "/var/www/$GNUSOCIAL_DOMAIN_NAME"

View File

@ -595,6 +595,7 @@ function remove_postactiv {
fi fi
kill_pid=$(pgrep "/var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/queuedaemon.php" | head -n 1) kill_pid=$(pgrep "/var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/queuedaemon.php" | head -n 1)
kill -9 "$kill_pid" kill -9 "$kill_pid"
pkill "$POSTACTIV_DOMAIN_NAME/htdocs/scripts/queuedaemon.php"
if [ -d "/var/www/$POSTACTIV_DOMAIN_NAME" ]; then if [ -d "/var/www/$POSTACTIV_DOMAIN_NAME" ]; then
rm -rf "/var/www/$POSTACTIV_DOMAIN_NAME" rm -rf "/var/www/$POSTACTIV_DOMAIN_NAME"