From 2b9d73c847419fbe8aa5d63eedf4de6577a3fd86 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sun, 22 Mar 2020 14:54:16 +0100
Subject: [PATCH] Update Pandora celery setting

---
 lxc-apps/pandora/image                                       | 2 +-
 lxc-apps/pandora/image.d/etc/services.d/pandora-cron/run     | 2 +-
 lxc-apps/pandora/image.d/etc/services.d/pandora-encoding/run | 2 +-
 lxc-apps/pandora/image.d/etc/services.d/pandora-tasks/run    | 2 +-
 lxc-apps/pandora/install.sh                                  | 2 +-
 lxc-apps/pandora/install/pandora_conf/local_settings.py      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lxc-apps/pandora/image b/lxc-apps/pandora/image
index e0437e3..5808242 100644
--- a/lxc-apps/pandora/image
+++ b/lxc-apps/pandora/image
@@ -77,7 +77,7 @@ RUN EOF
     ln -s /srv/pandora/conf/config.jsonc config.jsonc
     ln -s /srv/pandora/conf/gunicorn_config.py gunicorn_config.py
     ln -s /srv/pandora/conf/local_settings.py local_settings.py
-    chown -R 8080:8080 /srv/pandora
+    chown -R pandora:pandora /srv/pandora
 
     # Cleanup
     apk --no-cache del .deps
diff --git a/lxc-apps/pandora/image.d/etc/services.d/pandora-cron/run b/lxc-apps/pandora/image.d/etc/services.d/pandora-cron/run
index 739a992..6fa42b0 100755
--- a/lxc-apps/pandora/image.d/etc/services.d/pandora-cron/run
+++ b/lxc-apps/pandora/image.d/etc/services.d/pandora-cron/run
@@ -4,4 +4,4 @@ cd /srv/pandora/pandora
 export HOME /srv/pandora
 fdmove -c 2 1
 s6-setuidgid pandora
-./manage.py celerybeat -s /srv/pandora/data/celerybeat-schedule --pidfile pandora-cron.pid -l INFO
+/usr/bin/celery -A app beat -s /srv/pandora/data/celerybeat-schedule -l INFO
diff --git a/lxc-apps/pandora/image.d/etc/services.d/pandora-encoding/run b/lxc-apps/pandora/image.d/etc/services.d/pandora-encoding/run
index eb9a1d5..b03c3a2 100755
--- a/lxc-apps/pandora/image.d/etc/services.d/pandora-encoding/run
+++ b/lxc-apps/pandora/image.d/etc/services.d/pandora-encoding/run
@@ -4,4 +4,4 @@ cd /srv/pandora/pandora
 export HOME /srv/pandora
 fdmove -c 2 1
 s6-setuidgid pandora
-./manage.py celery worker -Q encoding -n pandora-encoding --pidfile pandora-encoding.pid --maxtasksperchild 500 -l INFO
+/usr/bin/celery -A app worker -Q encoding -n pandora-encoding --maxtasksperchild 500 -l INFO
diff --git a/lxc-apps/pandora/image.d/etc/services.d/pandora-tasks/run b/lxc-apps/pandora/image.d/etc/services.d/pandora-tasks/run
index 5f5c1d6..ffb3a1a 100755
--- a/lxc-apps/pandora/image.d/etc/services.d/pandora-tasks/run
+++ b/lxc-apps/pandora/image.d/etc/services.d/pandora-tasks/run
@@ -4,4 +4,4 @@ cd /srv/pandora/pandora
 export HOME /srv/pandora
 fdmove -c 2 1
 s6-setuidgid pandora
-./manage.py celery worker -Q default,celery -n pandora-default --pidfile pandora-tasks.pid --maxtasksperchild 1000 -l INFO
+/usr/bin/celery -A app worker -Q default,celery -n pandora-default --maxtasksperchild 1000 -l INFO
diff --git a/lxc-apps/pandora/install.sh b/lxc-apps/pandora/install.sh
index 3021f44..83a9721 100755
--- a/lxc-apps/pandora/install.sh
+++ b/lxc-apps/pandora/install.sh
@@ -32,7 +32,7 @@ spoc-container exec pandora-rabbitmq -- rabbitmqctl set_permissions -p /pandora
 
 # Configure Pandora
 install -o 108080 -g 108080 -m 750 -d ${PANDORA_CONF}
-install -o 108080 -g 108080 -m 750 -d ${PANDORA_DATA}
+install -o 108080 -g 108080 -m 755 -d ${PANDORA_DATA}
 install -o 108080 -g 108080 -m 640 pandora_conf/config.jsonc ${PANDORA_CONF}/config.jsonc
 install -o 108080 -g 108080 -m 640 pandora_conf/gunicorn_config.py ${PANDORA_CONF}/gunicorn_config.py
 envsubst <pandora_conf/local_settings.py | install -o 108080 -g 108080 -m 640 /dev/stdin ${PANDORA_CONF}/local_settings.py
diff --git a/lxc-apps/pandora/install/pandora_conf/local_settings.py b/lxc-apps/pandora/install/pandora_conf/local_settings.py
index f34e214..a6e9dab 100644
--- a/lxc-apps/pandora/install/pandora_conf/local_settings.py
+++ b/lxc-apps/pandora/install/pandora_conf/local_settings.py
@@ -9,7 +9,7 @@ DATABASES = {
 }
 DB_GIN_TRGM = True
 
-BROKER_URL = 'amqp://pandora:${PANDORA_RABBIT_PWD}@pandora-rabbitmq:5672//pandora'
+CELERY_BROKER_URL = 'amqp://pandora:${PANDORA_RABBIT_PWD}@pandora-rabbitmq:5672//pandora'
 
 EMAIL_HOST = 'host'