pump.io: reworked systemd

4 files changed, 51 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10264679f195..f7e5774a583b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pump.io
 	pkgdesc = A stream server that does most of what people really want from a social network
 	pkgver = 5.1.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://pump.io
 	install = pump.io.install
 	arch = i686
@@ -14,11 +14,14 @@ pkgbase = pump.io
 	provides = pumpio
 	conflicts = pumpio-git
 	conflicts = pumpio
+	options = !strip
 	backup = etc/webapps/pump.io/pump.io.json
 	source = https://github.com/pump-io/pump.io/archive/v5.1.4.tar.gz
+	source = pump.io.service
 	source = pump.io.sysusers
-	md5sums = bbed99788547daa2bbfcdd7f2055aceb
-	md5sums = 6e86aca928cf55108fcc8b7403cd2b39
+	sha256sums = d71f64f5b744f0b4bf4ce41689742a89ffc46189bb831494ec17de1b742cc917
+	sha256sums = b65aebe25c89d36fc91cd64774b5d3b7688515ec6ea653bc9d59649184286841
+	sha256sums = 8e0c47c0639899bbbb97d8a1ff2b8834a99ab3235b551224aa3237dd48f220d4
 
 pkgname = pump.io
 
diff --git a/PKGBUILD b/PKGBUILD
index 6f45d779e043..51a6c94882de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=pump.io
 pkgver=5.1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A stream server that does most of what people really want from a social network"
 url='http://pump.io'
 license=('Apache')
@@ -12,26 +12,39 @@ optdepends=('mongodb' 'redis')
 provides=('pumpio')
 conflicts=('pumpio-git' 'pumpio')
 install=${pkgname}.install
-backup=(etc/webapps/$pkgname/$pkgname.json)
-source=(https://github.com/pump-io/pump.io/archive/v$pkgver.tar.gz
-	"$pkgname.sysusers")
+backup=(etc/webapps/${pkgname}/${pkgname}.json)
+options=("!strip")
+source=("https://github.com/pump-io/pump.io/archive/v${pkgver}.tar.gz"
+  "${pkgname}.service"
+  "${pkgname}.sysusers")
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  npm install --production
+}
 
 package() {
-	cd $srcdir
-	local _npmdir="$pkgdir/usr/lib/node_modules/"
-	mkdir -p $_npmdir
-	cd $_npmdir
-	npm install -g --prefix "$pkgdir/usr" $pkgname@$pkgver
-	npm prune --production
+  cd "${srcdir}"
+  local _npmdir="${pkgdir}/usr/lib"
+  mkdir -p "${_npmdir}"
+  mkdir -p "${pkgdir}/usr/bin"
+  cp -rf "$pkgname-$pkgver" "${_npmdir}/${pkgname}"
+
+  msg2 "Installing systemd service"
+  install -Dm644 "${srcdir}/${pkgname}.service" \
+    "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 
-	msg2 "Installing systemd service"
-	install -Dm644 "$srcdir/$pkgname-$pkgver/$pkgname@.service" "$pkgdir/usr/lib/systemd/system/$pkgname@.service"
-        install -D -m644 "${srcdir}/$pkgname.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgname.conf"
+  install -D -m644 "${srcdir}/${pkgname}.sysusers" \
+    "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
 
-	install -Dm755 -d "$pkgname.json.sample" "$pkgdir/etc/$pkgname.json"
-	rm -rf $pkgdir/usr/etc
-	chmod 755 $pkgdir/usr/lib/node_modules/
+  install -Dm755 -d "${pkgname}.json.sample" "${pkgdir}/etc/${pkgname}.json"
+  rm -rf "${pkgdir}/usr/etc"
+  rm -rf "${pkgdir}/usr/lib/node_modules/npm"
+  rm -rf "${pkgdir}/usr/lib/pump.io/{test,utils}"
+ 
+  ln -s "${_npmdir}/${pkgname}"/bin/pump "${pkgdir}/usr/bin/pump"
 }
 
-md5sums=('bbed99788547daa2bbfcdd7f2055aceb'
-         '6e86aca928cf55108fcc8b7403cd2b39')
+sha256sums=('d71f64f5b744f0b4bf4ce41689742a89ffc46189bb831494ec17de1b742cc917'
+            'b65aebe25c89d36fc91cd64774b5d3b7688515ec6ea653bc9d59649184286841'
+            '8e0c47c0639899bbbb97d8a1ff2b8834a99ab3235b551224aa3237dd48f220d4')
diff --git a/pump.io.service b/pump.io.service
new file mode 100644
index 000000000000..7e46efea24d4
--- /dev/null
+++ b/pump.io.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Pump.io - stream server that does most of what people really want from a social network
+After=syslog.target network.target 
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/pump
+Environment=NODE_ENV=production
+User=pumpio
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pump.io.sysusers b/pump.io.sysusers
index e81f45fa1093..fc52df7714a0 100644
--- a/pump.io.sysusers
+++ b/pump.io.sysusers
@@ -1,2 +1,2 @@
-u pump.io - "Pump.io" /var/lib/pump.io /usr/bin/login
-g pump.io - -
+u pumpio - "Pump.io" /var/lib/pump.io /usr/bin/login
+g pumpio - -