diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-01-12 16:16:48 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-01-12 16:16:48 +0100 |
| commit | 7f2c23f403dc4d9bddc7fb854be7f65ccd0eb64b (patch) | |
| tree | c93c16b841ab5ef1beb6fb7e178225c9322afb95 | |
| parent | a060b26ee54f8f2e95ad812faff3ef0511accf3e (diff) | |
| download | Ishtar-7f2c23f403dc4d9bddc7fb854be7f65ccd0eb64b.tar.bz2 Ishtar-7f2c23f403dc4d9bddc7fb854be7f65ccd0eb64b.zip | |
Install script: fix prepare and delete instance scripts
| -rwxr-xr-x | install/ishtar-delete-instance | 41 | ||||
| -rwxr-xr-x | install/ishtar-prepare-instance | 14 |
2 files changed, 32 insertions, 23 deletions
diff --git a/install/ishtar-delete-instance b/install/ishtar-delete-instance index a8b68b849..65aabe1c8 100755 --- a/install/ishtar-delete-instance +++ b/install/ishtar-delete-instance @@ -76,36 +76,47 @@ do_delete_instance() { exit 1 fi - sed '/'$to_delete'/d' $INSTANCES_FILE > /tmp/new_instances - mv /tmp/new_instances $INSTANCES_FILE - + systemctl stop uwsgi + systemctl stop monit || true INSTANCE=$to_delete rm -rf $ISHTAR_PATH/$INSTANCE rm -f "$NGINX_AVAILABLE_PATH/ishtar-$INSTANCE.conf" rm -f "$NGINX_ENABLE_PATH/ishtar-$INSTANCE.conf" rm -f "$UWSGI_AVAILABLE_PATH/ishtar-$INSTANCE.ini" rm -f "$UWSGI_ENABLE_PATH/ishtar-$INSTANCE.ini" + rm -f "/etc/monit/conf-available/celery-$INSTANCE" + rm -f "/etc/monit/conf-enabled/celery-$INSTANCE" + systemctl start uwsgi || true + systemctl start monit || true + + if [ $USE_CELERY = 'yes' ]; then + /usr/bin/supervisorctl stop celery_$INSTANCE || (true && cecho r "/usr/bin/supervisorctl stop celery_$INSTANCE - failed") + /usr/bin/supervisorctl remove celery_$INSTANCE || (true && cecho r "/usr/bin/supervisorctl remove celery_$INSTANCE - failed") + /usr/sbin/rabbitmqctl delete_vhost /ishtar$INSTANCE || (true && cecho r "/usr/sbin/rabbitmqctl delete_vhost /ishtar$INSTANCE - failed") + /usr/sbin/rabbitmqctl delete_user ishtar$INSTANCE || (true && cecho r "/usr/sbin/rabbitmqctl delete_user ishtar$INSTANCE - failed") + /usr/bin/supervisorctl reload || (true && cecho r "/usr/bin/supervisorctl reload - failed") + fi + + rm -f /etc/supervisor/conf.d/celery_$INSTANCE.conf DB_NAME="ishtar-$INSTANCE" export DB_NAME su postgres <<'EOF' - dropdb "$DB_NAME" - dropuser "$DB_NAME" + cd $HOME + dropdb "$DB_NAME" || (true && echo 'dropdb $DB_NAME - failed') + dropuser "$DB_NAME" || (true && echo 'dropuser $DB_NAME - failed') EOF - if [ $USE_CELERY = 'yes' ]; then - systemctl disable celery-$INSTANCE - systemctl stop celery-$INSTANCE - /usr/sbin/rabbitmqctl delete_vhost /ishtar$INSTANCE - /usr/sbin/rabbitmqctl delete_user ishtar$INSTANCE - rm "/etc/default/celeryd-"$INSTANCE - rm "/etc/systemd/system/celery-"$INSTANCE".service" - systemctl daemon-reload - fi + + sed '/'$to_delete'/d' $INSTANCES_FILE > /tmp/new_instances + mv /tmp/new_instances $INSTANCES_FILE echo "" - cecho g $to_delete" have been completly removed" + cecho g $to_delete" have been completely removed" echo "" } do_delete_instance +systemctl start uwsgi || true +systemctl start monit || true + diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index f176d8f90..bafc6133d 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -271,12 +271,10 @@ EOF sed -s "s|example_project|$INSTANCE|g;" \ $INSTANCE"/celery_app.py.sample" > \ $INSTANCE"/celery_app.py" - if [ -d "$DIRECTORY" ]; then - sed -s "s|#APP_NAME#|$INSTANCE|g;" \ - "install/monit.template" > \ - "/etc/monit/conf-available/celery-"$INSTANCE - fi - + mkdir -p /etc/monit/conf-available/ + sed -s "s|#APP_NAME#|$INSTANCE|g;" \ + "install/monit.template" > \ + "/etc/monit/conf-available/celery-"$INSTANCE fi ### __init__.py @@ -388,8 +386,8 @@ EOF if [ $USE_CELERY = 'yes' ]; then SUPERVISOR=`which supervisorctl` if [ $SUPERVISOR ]; then - supervisorctl add celery_$INSTANCE - supervisorctl start celery_$INSTANCE + supervisorctl reload || (true && cecho r "supervisorctl reload - failed") + supervisorctl start celery_$INSTANCE || (true && cecho r "supervisorctl start celery_$INSTANCE - failed") fi fi |