bug with celery5 and workdir

4 files changed, 10 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf6298808142..1cad7d353656 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = funkwhale
 	pkgdesc = A self-hosted, modern free and open-source music server, heavily inspired by Grooveshark.
 	pkgver = 1.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://funkwhale.audio/
 	install = funkwhale.install
 	arch = any
@@ -80,8 +80,8 @@ pkgbase = funkwhale
 	sha256sums = 0b77367cb4e8d1b57af59282af90ac41e0915de85cf5337b02f16e6aa0bd0129
 	sha256sums = 2906a075b41dcd2375c601482cb5a00e42cb87c613012b176c570d77918afbf2
 	sha256sums = f56a2e8947809db4325a6c65141f6eb87e7428cc0e5a57032fc7ce050bf396fa
-	sha256sums = a964a7802252d20a3319e2131c27ec307ad4f454921c2db31971c080150d7c9b
-	sha256sums = 0e6d7c96b7c1ec63794214decb1f2e7dd112a22b02e55555cf98c2a573014af6
+	sha256sums = 812c9a49436725e18768c5eb772c7207c184cdcf3a057432dc998387c481bd8d
+	sha256sums = 57c17dbd033fff76b344c90114d3b1f9eae3aaaa49128b61fcd1b5e808561dc3
 	sha256sums = 9d5a6f2cae6f18e22c5423247570519e8c772a9447ec2d92bd2fe5d69e519470
 	sha256sums = f37b1b6257c5b92272f36773041c83fc72276ff4040100fba92db8136cc9177d
 	sha256sums = cea307055e9f8001a1507c507e1be91352d896cab17260a221f4ab8c298506d8
diff --git a/PKGBUILD b/PKGBUILD
index 6c40052478b0..5b1490f657f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=funkwhale
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A self-hosted, modern free and open-source music server, heavily inspired by Grooveshark."
 arch=(any)
 url="https://funkwhale.audio/"
@@ -82,8 +82,8 @@ sha256sums=('5c0689c0e05d3271d161c13e8063e5053f4ecb582e3a7e3d6973d1c46be23887'
             '0b77367cb4e8d1b57af59282af90ac41e0915de85cf5337b02f16e6aa0bd0129'
             '2906a075b41dcd2375c601482cb5a00e42cb87c613012b176c570d77918afbf2'
             'f56a2e8947809db4325a6c65141f6eb87e7428cc0e5a57032fc7ce050bf396fa'
-            'a964a7802252d20a3319e2131c27ec307ad4f454921c2db31971c080150d7c9b'
-            '0e6d7c96b7c1ec63794214decb1f2e7dd112a22b02e55555cf98c2a573014af6'
+            '812c9a49436725e18768c5eb772c7207c184cdcf3a057432dc998387c481bd8d'
+            '57c17dbd033fff76b344c90114d3b1f9eae3aaaa49128b61fcd1b5e808561dc3'
             '9d5a6f2cae6f18e22c5423247570519e8c772a9447ec2d92bd2fe5d69e519470'
             'f37b1b6257c5b92272f36773041c83fc72276ff4040100fba92db8136cc9177d'
             'cea307055e9f8001a1507c507e1be91352d896cab17260a221f4ab8c298506d8'
diff --git a/funkwhale-beat.service b/funkwhale-beat.service
index d9b36b9c3584..6cacc92e1976 100644
--- a/funkwhale-beat.service
+++ b/funkwhale-beat.service
@@ -5,9 +5,10 @@ PartOf=funkwhale.service
 
 [Service]
 User=funkwhale
+WorkingDirectory=/usr/share/webapps/funkwhale/api
 # adapt this depending on the path of your funkwhale installation
 EnvironmentFile=/srv/funkwhale/config/env
-ExecStart=/usr/bin/celery -A funkwhale_api.taskapp beat -l INFO --workdir=/usr/share/webapps/funkwhale/api --schedule=/srv/funkwhale/api/celerybeat-schedule --pidfile=/srv/funkwhale/api/celerybeat.pid
+ExecStart=/usr/bin/celery --workdir=/usr/share/webapps/funkwhale/api -A funkwhale_api.taskapp beat -l INFO --schedule=/srv/funkwhale/api/celerybeat-schedule --pidfile=/srv/funkwhale/api/celerybeat.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/funkwhale-worker.service b/funkwhale-worker.service
index 494b52a02b52..a0185ad976fa 100644
--- a/funkwhale-worker.service
+++ b/funkwhale-worker.service
@@ -7,6 +7,7 @@ PartOf=funkwhale.service
 User=funkwhale
 # adapt this depending on the path of your funkwhale installation
 EnvironmentFile=/srv/funkwhale/config/env
+WorkingDirectory=/usr/share/webapps/funkwhale/api
 # Celery workers handle background tasks (such file imports or federation
 # messaging). The more processes a worker gets, the more tasks
 # can be processed in parallel. However, more processes also means
@@ -15,7 +16,7 @@ EnvironmentFile=/srv/funkwhale/config/env
 # of CPUs. You can adjust this, by explicitly setting the --concurrency
 # flag:
 #   celery -A funkwhale_api.taskapp worker -l INFO --concurrency=4
-ExecStart=/usr/bin/celery -A funkwhale_api.taskapp worker -l INFO --workdir=/usr/share/webapps/funkwhale/api
+ExecStart=/usr/bin/celery --workdir=/usr/share/webapps/funkwhale/api -A funkwhale_api.taskapp worker -l INFO
 
 [Install]
 WantedBy=multi-user.target