summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgetzze2018-11-24 17:22:10 +0000
committergetzze2018-11-24 17:22:10 +0000
commita21fbb5bd1313f3272b457551e1a445b68df50ce (patch)
treefa2129554dab5c61c9e92a825b8c7ab47639624b
parent0a98f273576c7ed2bf000882730e2ccac1dcd9cb (diff)
downloadaur-a21fbb5bd1313f3272b457551e1a445b68df50ce.tar.gz
provide funkwhale.service instead of .target
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD19
-rw-r--r--funkwhale.service12
3 files changed, 24 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb0c702f30b..ecfe86dcb7f 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 = 0.17
- pkgrel = 1
+ pkgrel = 2
url = https://funkwhale.audio/
arch = any
license = GPL3
@@ -60,22 +60,22 @@ pkgbase = funkwhale
source = funkwhale-0.17-front.zip::https://code.eliotberriot.com/funkwhale/funkwhale/builds/artifacts/0.17/download?job=build_front
source = https://code.eliotberriot.com/funkwhale/funkwhale/raw/0.17/deploy/funkwhale_proxy.conf
source = https://code.eliotberriot.com/funkwhale/funkwhale/raw/0.17/deploy/nginx.template
- source = https://code.eliotberriot.com/funkwhale/funkwhale/raw/0.17/deploy/funkwhale.target
source = https://code.eliotberriot.com/funkwhale/funkwhale/raw/0.17/deploy/funkwhale-beat.service
source = https://code.eliotberriot.com/funkwhale/funkwhale/raw/0.17/deploy/funkwhale-worker.service
source = https://code.eliotberriot.com/funkwhale/funkwhale/raw/0.17/deploy/funkwhale-server.service
source = apache-funkwhale.conf
source = env-template
+ source = funkwhale.service
sha256sums = 8211b9ff86cde6557ff8b3904ffeb7380e18e47b7b4b76c91f30986d284911a3
sha256sums = 3578e1c60da578681c4e60a94dde1e18511f2455814c980b24748c87ffb8b4a2
sha256sums = 2906a075b41dcd2375c601482cb5a00e42cb87c613012b176c570d77918afbf2
sha256sums = 0d022981f24c9ed8306751d905e85a2fa086c124d7284cc765a3a83814e6efd8
- sha256sums = 9a84d9e1f105cd92448e6e4696e11412584b616b248d578e2fe756972a20f74e
sha256sums = b30fd8f119a53a424c9372a3fdcaad3175f33f242b498b0348c697942573588d
sha256sums = 976ddd2f409efa367e8f53d96092007d0886a473507294a3092a96e885b5e59a
sha256sums = b2ff1a2911883416b3a8c35a3e579d493c0bcf4039604020a206c6e8b5fc0ba7
sha256sums = 26f91e1b22d7c46a6e26c25889babb8d5e77f7a4aec06bd61833cf953fd48f4a
sha256sums = 90c9a2b1ef1ac58589eda10c09a9af8141813aa6b661251eb571a1f757bea8c5
+ sha256sums = 2aa5991083ef375b3440e0e0cff6e7de622137bcac1fb852d62f481aa8a5700d
pkgname = funkwhale
diff --git a/PKGBUILD b/PKGBUILD
index 66744ee0a7d..7dba1881a44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=funkwhale
pkgver=0.17
-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/"
@@ -61,32 +61,31 @@ source=("${pkgname}-${pkgver}-api.zip::${_source_api}build_api"
"${pkgname}-${pkgver}-front.zip::${_source_api}build_front"
"${_source_env}funkwhale_proxy.conf"
"${_source_env}nginx.template"
- "${_source_env}funkwhale.target"
"${_source_env}funkwhale-beat.service"
"${_source_env}funkwhale-worker.service"
"${_source_env}funkwhale-server.service"
"apache-funkwhale.conf"
"env-template"
+ "funkwhale.service"
)
sha256sums=('8211b9ff86cde6557ff8b3904ffeb7380e18e47b7b4b76c91f30986d284911a3'
'3578e1c60da578681c4e60a94dde1e18511f2455814c980b24748c87ffb8b4a2'
'2906a075b41dcd2375c601482cb5a00e42cb87c613012b176c570d77918afbf2'
'0d022981f24c9ed8306751d905e85a2fa086c124d7284cc765a3a83814e6efd8'
- '9a84d9e1f105cd92448e6e4696e11412584b616b248d578e2fe756972a20f74e'
'b30fd8f119a53a424c9372a3fdcaad3175f33f242b498b0348c697942573588d'
'976ddd2f409efa367e8f53d96092007d0886a473507294a3092a96e885b5e59a'
'b2ff1a2911883416b3a8c35a3e579d493c0bcf4039604020a206c6e8b5fc0ba7'
'26f91e1b22d7c46a6e26c25889babb8d5e77f7a4aec06bd61833cf953fd48f4a'
- '90c9a2b1ef1ac58589eda10c09a9af8141813aa6b661251eb571a1f757bea8c5')
+ '90c9a2b1ef1ac58589eda10c09a9af8141813aa6b661251eb571a1f757bea8c5'
+ '2aa5991083ef375b3440e0e0cff6e7de622137bcac1fb852d62f481aa8a5700d')
prepare() {
cd "$srcdir"
- sed -i 's#WorkingDirectory=/srv/funkwhale/api#WorkingDirectory=/usr/share/webapps/funkwhale/api#' *.service
- sed -i 's#EnvironmentFile=/srv/funkwhale/config/.env#EnvironmentFile=/etc/webapps/funkwhale/config/.env#' *.service
- sed -i 's#ExecStart=/srv/funkwhale/virtualenv/bin/#ExecStart=/usr/bin/#' *.service
-
-
+ sed -i 's#WorkingDirectory=/srv/funkwhale/api#WorkingDirectory=/usr/share/webapps/funkwhale/api#' funkwhale-*.service
+ sed -i 's#EnvironmentFile=/srv/funkwhale/config/.env#EnvironmentFile=/etc/webapps/funkwhale/config/.env#' funkwhale-*.service
+ sed -i 's#ExecStart=/srv/funkwhale/virtualenv/bin/#ExecStart=/usr/bin/#' funkwhale-*.service
+ sed -i 's#PartOf=funkwhale.target#PartOf=funkwhale.service#' funkwhale-*.service
}
build() {
@@ -109,7 +108,7 @@ package() {
install -Dm644 apache-funkwhale.conf "$pkgdir"/etc/webapps/${pkgname}/.
install -Dm644 env-template "$pkgdir"/etc/webapps/${pkgname}/env.template
- install -Dm644 funkwhale.target "$pkgdir/usr/lib/systemd/system/funkwhale.target"
+ install -Dm644 funkwhale.service "$pkgdir/usr/lib/systemd/system/funkwhale.service"
install -Dm644 funkwhale-beat.service "$pkgdir/usr/lib/systemd/system/funkwhale-beat.service"
install -Dm644 funkwhale-worker.service "$pkgdir/usr/lib/systemd/system/funkwhale-worker.service"
install -Dm644 funkwhale-server.service "$pkgdir/usr/lib/systemd/system/funkwhale-server.service"
diff --git a/funkwhale.service b/funkwhale.service
new file mode 100644
index 00000000000..22b98a8076d
--- /dev/null
+++ b/funkwhale.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Funkwhale
+After=httpd.service nginx.service
+Wants=funkwhale-server.service funkwhale-beat.service funkwhale-worker.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/true
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target