update to v0.9.0

6 files changed, 37 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0270a1cb759..ac994168c9a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Sun Aug 13 04:25:49 UTC 2017
 pkgbase = parsoid
 	pkgdesc = A bidirectional wikitext parser and runtime
-	pkgver = 0.8.0
+	pkgver = 0.9.0
 	pkgrel = 1
 	url = https://www.mediawiki.org/wiki/Parsoid
 	install = parsoid.install
@@ -17,12 +15,16 @@ pkgbase = parsoid
 	options = !strip
 	backup = usr/share/webapps/parsoid/localsettings.js
 	backup = usr/share/webapps/parsoid/config.yaml
-	source = https://github.com/wikimedia/parsoid/archive/v0.8.0.zip
+	source = https://github.com/wikimedia/parsoid/archive/v0.9.0.zip
 	source = parsoid.service
 	source = parsoid.install
-	sha512sums = c6821d871edf2e23329693ff60eb9d8dd4fc3475982a5edfc4514d3e059a403f9b32e2b695d4074f077eba016f51ecf93c2cfac91961d36c54a77c97897bc1b7
-	sha512sums = b4f8a2fc5119fa4741d79c66b5bb2282b274018ad548d383c6007fbe66d14ee1de6744a2cdcf1f8453ca055f48716598b42d3faecd29b81f61c06a54df64ed7d
-	sha512sums = 3b6fdba7a211ccfb038cd1fbe38214b439ce873d6c5bf99187e0c2be19052c2f28ebd322ddf5696f676ee426f177fec828399f859bda6cc4592518e9fa5bbdf5
+	source = parsoid.sysusers
+	source = parsoid.tmpfiles
+	sha512sums = 0d527df2d5a9b43ac33a52dbf2c8b71c63b55f341ca107d44f878b22c9e7a297b2e6492f77ae7ca88d2834d58fb14cb0d1a57271ec609515579c1031e5eac45b
+	sha512sums = 3733d08751209fdef134940bbcce48efd0f380e13a8df466a7a1010450857a924aa364628242e4307cf40f4a34e60c1aeb1400d9a5b9fed88b448ed549e4d3f1
+	sha512sums = 70473c30f7d78f40da1ab91c717e012575687e5edde18011d7a8759fc7ad0ad28a20514794a836d855b409a9becb4c779365d72dc3d5dcd62275d05f558876e8
+	sha512sums = 7f2346af222052e2e685d859e0bb7a7c7c9f03988f772856e0888cad299cb3870afdc280feb9e2798e7989d3382f68f689d43a685b466ce9f138edb77b20de3a
+	sha512sums = 6158afa3c276ddb5090166680621b7b9213f3d73b2d1a95181f5441631be039e7d454228d2f214f1411bb7f953475ddbd368e89eaa2288ac200ac666a57a6a99
 
 pkgname = parsoid
 
diff --git a/PKGBUILD b/PKGBUILD
index 8da6d7f71349..05d279f07f2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Horo <horo@yoitsu.moe>
 
 pkgname=parsoid
-pkgver=0.8.0
+pkgver=0.9.0
 pkgrel=1
 pkgdesc="A bidirectional wikitext parser and runtime"
 arch=('any')
@@ -19,10 +19,16 @@ backup=(usr/share/webapps/parsoid/localsettings.js
 	usr/share/webapps/parsoid/config.yaml)
 source=("https://github.com/wikimedia/parsoid/archive/v${pkgver}.zip"
         "parsoid.service"
-        "parsoid.install")
-sha512sums=("c6821d871edf2e23329693ff60eb9d8dd4fc3475982a5edfc4514d3e059a403f9b32e2b695d4074f077eba016f51ecf93c2cfac91961d36c54a77c97897bc1b7"
-            "b4f8a2fc5119fa4741d79c66b5bb2282b274018ad548d383c6007fbe66d14ee1de6744a2cdcf1f8453ca055f48716598b42d3faecd29b81f61c06a54df64ed7d"
-            "3b6fdba7a211ccfb038cd1fbe38214b439ce873d6c5bf99187e0c2be19052c2f28ebd322ddf5696f676ee426f177fec828399f859bda6cc4592518e9fa5bbdf5")
+        "parsoid.install"
+        "parsoid.sysusers"
+        "parsoid.tmpfiles")
+        sha512sums=(
+            "0d527df2d5a9b43ac33a52dbf2c8b71c63b55f341ca107d44f878b22c9e7a297b2e6492f77ae7ca88d2834d58fb14cb0d1a57271ec609515579c1031e5eac45b"
+            "3733d08751209fdef134940bbcce48efd0f380e13a8df466a7a1010450857a924aa364628242e4307cf40f4a34e60c1aeb1400d9a5b9fed88b448ed549e4d3f1"
+            "70473c30f7d78f40da1ab91c717e012575687e5edde18011d7a8759fc7ad0ad28a20514794a836d855b409a9becb4c779365d72dc3d5dcd62275d05f558876e8"
+            "7f2346af222052e2e685d859e0bb7a7c7c9f03988f772856e0888cad299cb3870afdc280feb9e2798e7989d3382f68f689d43a685b466ce9f138edb77b20de3a"  
+            "6158afa3c276ddb5090166680621b7b9213f3d73b2d1a95181f5441631be039e7d454228d2f214f1411bb7f953475ddbd368e89eaa2288ac200ac666a57a6a99")  
+
 options=('!strip')
 install="parsoid.install"
 prepare() {
@@ -39,6 +45,8 @@ package() {
     cp config.example.yaml config.yaml
     cp -R . "${pkgdir}/usr/share/webapps/${pkgname}/"
     install -Dm644 "${srcdir}/parsoid.service" "${pkgdir}/usr/lib/systemd/system/parsoid.service"
+    install -Dm644 "$srcdir"/parsoid.sysusers "$pkgdir"/usr/lib/sysusers.d/parsoid.conf
+    install -Dm644 "$srcdir"/parsoid.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/parsoid.conf
     install -D "COPYING.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
diff --git a/parsoid.install b/parsoid.install
index 7f739124a41e..ff54b24f2042 100644
--- a/parsoid.install
+++ b/parsoid.install
@@ -13,11 +13,8 @@ note() {
 }
 
 _update() {
-    if ! getent passwd parsoid &>/dev/null; then
-        msg_blue "Adding user 'parsoid'"
-        useradd -m -r -U -d /usr/share/webapps/parsoid -s /bin/false parsoid &>/dev/null
-        chown -R parsoid /usr/share/webapps/parsoid
-	chgrp -R parsoid /usr/share/webapps/parsoid
+    if  getent passwd parsoid &>/dev/null; then
+        userdel -rf parsoid &>/dev/null
     fi
 }
 
@@ -27,15 +24,4 @@ post_install() {
     echo ">> Reference comments in this file for help ."
 }
 
-post_upgrade() {
-    _update
-    note "Parsoid now use 'config.yaml' as config file."
-}
-
-post_remove() {
-    if getent passwd parsoid &>/dev/null; then
-        msg_blue "Removing user 'parsoid'"
-        userdel -rf parsoid &>/dev/null
-    fi
-}
 
diff --git a/parsoid.service b/parsoid.service
index 895d8e43debb..ff1cde35d315 100644
--- a/parsoid.service
+++ b/parsoid.service
@@ -9,12 +9,20 @@ WantedBy=multi-user.target
  
 [Service]
 Type=simple
-User=parsoid
-Group=parsoid
 WorkingDirectory=/usr/share/webapps/parsoid
 ExecStart=/usr/bin/node /usr/share/webapps/parsoid/bin/server.js
 KillMode=process
 Restart=on-success
 PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+ProtectHome=true
+NoNewPrivileges=true
+CapabilityBoundingSet=
+ReadOnlyPaths=/
+ReadWritePaths=/run
+ReadWritePaths=/usr/share/webapps/parsoid
 StandardOutput=syslog
 
+[Install]
+WantedBy=multi-user.target
diff --git a/parsoid.sysusers b/parsoid.sysusers
new file mode 100644
index 000000000000..ce8c6951d52f
--- /dev/null
+++ b/parsoid.sysusers
@@ -0,0 +1 @@
+u parsoid - "parsoid service" /usr/share/webapps/parsoid
diff --git a/parsoid.tmpfiles b/parsoid.tmpfiles
new file mode 100644
index 000000000000..d2bec9ab3f64
--- /dev/null
+++ b/parsoid.tmpfiles
@@ -0,0 +1,2 @@
+d /usr/share/webapps/parsoid 0755 parsoid parsoid
+d /run/parsoid 0755 parsoid parsoid