diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-03-19 14:00:30 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:27 +0200 |
| commit | ad0b60883ebc07f336e128f3ee857671e5a69c1f (patch) | |
| tree | 39f3c178d06182de2293d8ad9df1e1ad1f92fb60 /install | |
| parent | 4c547a73e20875febf7f98779b51a808c92c4eb9 (diff) | |
| download | Ishtar-ad0b60883ebc07f336e128f3ee857671e5a69c1f.tar.bz2 Ishtar-ad0b60883ebc07f336e128f3ee857671e5a69c1f.zip | |
Prepare instance script: fix bad dir nav
Diffstat (limited to 'install')
| -rwxr-xr-x | install/ishtar-prepare-instance | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index df7b72088..a7db69aaf 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -269,7 +269,6 @@ EOF /usr/sbin/rabbitmqctl add_user ishtar$INSTANCE $RBMQ_PASSWORD /usr/sbin/rabbitmqctl set_permissions -p /ishtar$INSTANCE ishtar$INSTANCE ".*" ".*" ".*" CELERY_CONF="BROKER_URL = 'ampq://ishtar"$INSTANCE":"$RBMQ_PASSWORD"@localhost//ishtar"$INSTANCE"'" - CELERY_CONF=$CELERY_CONF"\nUSE_BACKGROUND_TASK = True" sed -s "s|#APP_NAME#|$INSTANCE|g;" \ "install/celeryd.default.template" > \ "/etc/default/celeryd-"$INSTANCE @@ -287,6 +286,7 @@ EOF else ln -s __init__.py.base.sample __init__.py fi + cd - ### local_settings.py @@ -305,6 +305,10 @@ EOF echo $CELERY_CONF >> "$INSTANCE/local_settings.py" + if [ -v USE_CELERY ]; then + echo "USE_BACKGROUND_TASK = True" >> "$INSTANCE/local_settings.py" + fi + if [ -f $CONFIG_PATH"extra_settings.py" ]; then ln -s $CONFIG_PATH"extra_settings.py" >> "$INSTANCE/extra_settings.py" fi |