summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD36
-rw-r--r--peerflix-server.service4
-rw-r--r--peerflix-server.sh3
-rw-r--r--peerflix.sysusers2
-rw-r--r--peerflix.tmpfiles3
6 files changed, 35 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 92be388cd9be..02460fc6d824 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = peerflix-server
pkgdesc = Streaming torrent client for node.js with web ui
- pkgver = 0.4.2
+ pkgver = 0.6.0
pkgrel = 1
url = https://github.com/asapach/peerflix-server
arch = i686
@@ -8,12 +8,12 @@ pkgbase = peerflix-server
license = MIT
makedepends = npm
depends = nodejs
- conflicts = peerflix-server-git
options = !strip
source = peerflix-server.service
- source = peerflix-server.sh
- md5sums = c16f83bd40fe9905b51c3ffd073bbcd0
- md5sums = ea9702820f92bef0636a4f01d13dd348
+ source = peerflix.sysusers
+ source = peerflix.tmpfiles
+ sha256sums = 0e7df5ed1521ff0f1f1e039cccdc20b1c92a3b0edc1d38e5e524db37559cd006
+ sha256sums = 669025775203d7e39255be921e51d93781ee74b10d3e8bf22d381035c2605fcc
+ sha256sums = 88da04100ee77e2ac03e87b22636147ff38bb091f9b03e2e7df1e57027a0b2bf
pkgname = peerflix-server
-
diff --git a/PKGBUILD b/PKGBUILD
index 243f92c792d4..fb0d32c24181 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: robertfoster
pkgname=peerflix-server
-pkgver=0.4.2
+pkgver=0.6.0
pkgrel=1
pkgdesc="Streaming torrent client for node.js with web ui"
arch=('i686' 'x86_64')
@@ -9,21 +9,29 @@ url="https://github.com/asapach/peerflix-server"
license=('MIT')
depends=('nodejs')
makedepends=('npm')
-source=($pkgname.service
- $pkgname.sh
+source=("${pkgname}.service"
+ peerflix.sysusers
+ peerflix.tmpfiles
)
-conflicts=('peerflix-server-git')
options=('!strip')
-package(){
- cd $srcdir
- local _npmdir="$pkgdir/usr/lib/node_modules/"
- mkdir -p $_npmdir
- cd $_npmdir
- npm install -g --prefix "$pkgdir/usr" --ignore-scripts --production $pkgname@$pkgver
+package() {
+ cd $srcdir
+ local _npmdir="${pkgdir}/usr/lib/node_modules"
+ mkdir -p "${_npmdir}"
+ cd "${_npmdir}"
+ npm install -g --user root --prefix "${pkgdir}/usr" --production "${pkgname}@$pkgver"
- install -Dm644 "${srcdir}/$pkgname.service" "${pkgdir}/usr/lib/systemd/system/$pkgname.service"
- install -Dm775 "${srcdir}/peerflix-server.sh" "${pkgdir}/usr/bin/peerflix-server"
+ install -Dm644 "${srcdir}/${pkgname}.service" \
+ "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+ install -D -m644 "${srcdir}/peerflix.sysusers" \
+ "${pkgdir}/usr/lib/sysusers.d/peerflix.conf"
+ install -D -m644 "${srcdir}/peerflix.tmpfiles" \
+ "${pkgdir}/usr/lib/tmpfiles.d/peerflix.conf"
+ find "${pkgdir}" -name package.json -print0 | xargs -r -0 sed -i '/_where/d'
+ rm -rf "${_npmdir}/root"
}
-md5sums=('c16f83bd40fe9905b51c3ffd073bbcd0'
- 'ea9702820f92bef0636a4f01d13dd348')
+
+sha256sums=('0e7df5ed1521ff0f1f1e039cccdc20b1c92a3b0edc1d38e5e524db37559cd006'
+ '669025775203d7e39255be921e51d93781ee74b10d3e8bf22d381035c2605fcc'
+ '88da04100ee77e2ac03e87b22636147ff38bb091f9b03e2e7df1e57027a0b2bf')
diff --git a/peerflix-server.service b/peerflix-server.service
index b3d33e017782..55f10240232e 100644
--- a/peerflix-server.service
+++ b/peerflix-server.service
@@ -2,8 +2,8 @@
Description=Peerflix Server
[Service]
-Type=forking
-User=root
+Type=simple
+User=peerflix
ExecStart=/usr/bin/peerflix-server
[Install]
diff --git a/peerflix-server.sh b/peerflix-server.sh
deleted file mode 100644
index d2f1d437dce2..000000000000
--- a/peerflix-server.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/sh
-cd /usr/lib/node_modules/peerflix-server/server
-node bin.js &
diff --git a/peerflix.sysusers b/peerflix.sysusers
new file mode 100644
index 000000000000..fe845659c3d5
--- /dev/null
+++ b/peerflix.sysusers
@@ -0,0 +1,2 @@
+u peerflix - "Peerflix Server" /var/lib/peerflix /bin/bash
+
diff --git a/peerflix.tmpfiles b/peerflix.tmpfiles
new file mode 100644
index 000000000000..39a7d5bb5da3
--- /dev/null
+++ b/peerflix.tmpfiles
@@ -0,0 +1,3 @@
+Z /usr/lib/node_modules/peerflix-server 0755 peerflix peerflix
+d /var/lib/peerflix 0777 peerflix peerflix
+