diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-05-21 17:59:49 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:28 +0200 |
| commit | 630bb9823ed828079dbc44c3def88cdd49850b0f (patch) | |
| tree | 6ba19c2caa5e2230d98453a6ab6be32a662d169c | |
| parent | f2c1f9265ed0a4f8bf3e65d45787d6b8e34c6182 (diff) | |
| download | Ishtar-630bb9823ed828079dbc44c3def88cdd49850b0f.tar.bz2 Ishtar-630bb9823ed828079dbc44c3def88cdd49850b0f.zip | |
Celery: fix rabbitmq conf
| -rw-r--r-- | example_project/settings.py | 5 | ||||
| -rwxr-xr-x | install/ishtar-prepare-instance | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index a3c5318db..c479d1bae 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -278,6 +278,8 @@ DOT_BINARY = "" TEST_RUNNER = 'ishtar_common.tests.ManagedModelTestRunner' +CELERY_BROKER_URL = '' + try: from local_settings import * except ImportError as e: @@ -325,7 +327,8 @@ if DEBUG: LOGGING['loggers'][logger]['handlers'] += ['console'] if USE_BACKGROUND_TASK: - CELERY_BROKER_URL = 'amqp://localhost' + if not CELERY_BROKER_URL: + CELERY_BROKER_URL = 'amqp://localhost' if DJANGO_EXTENSIONS: INSTALLED_APPS.append('django_extensions') diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance index 8676a4c80..bd235d5a2 100755 --- a/install/ishtar-prepare-instance +++ b/install/ishtar-prepare-instance @@ -268,7 +268,7 @@ EOF /usr/sbin/rabbitmqctl add_vhost /ishtar$INSTANCE /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_BROKER_URL = 'amqp://ishtar"$INSTANCE":"$RBMQ_PASSWORD"@localhost//ishtar"$INSTANCE"'" sed -s "s|#APP_NAME#|$INSTANCE|g;" \ "install/celeryd.default.template" > \ "/etc/default/celeryd-"$INSTANCE |