Use systemd tmpfiles.d to change owner

4 files changed, 12 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b468f64c851c..67bf4c105d0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = octoprint-venv
 	pkgdesc = The snappy snappy web interface for your 3D printer! (virtualenv installation type)
 	pkgver = 1.3.8
-	pkgrel = 3
+	pkgrel = 4
 	url = http://octoprint.org/
 	install = octoprint.install
 	arch = any
@@ -14,9 +14,11 @@ pkgbase = octoprint-venv
 	source = https://github.com/foosel/OctoPrint/archive/1.3.8.tar.gz
 	source = octoprint.service
 	source = octoprint.sysusers
+	source = octoprint.tmpfiles
 	sha256sums = ca1bc5352ef20778722a6b2aedef4c8dbe28d0d82c2526f84f3db07245a01aad
 	sha256sums = 7f7aa02075901d7501a03bda082f050ba5862e58034f0216b5a76d2a25135d3a
 	sha256sums = 79d0f9fe053181eaa77f472b5235463ce217475d47fada9869f42d313b4651a9
+	sha256sums = ff05d3e76a59f23f2d06d318f8bac1bf5797fafe1c86c45de0249983d2072c25
 
 pkgname = octoprint-venv
 
diff --git a/PKGBUILD b/PKGBUILD
index 0135067ff1f9..1fed1c1b8e40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=octoprint-venv
 pkgver=1.3.8
-pkgrel=3
+pkgrel=4
 pkgdesc="The snappy snappy web interface for your 3D printer! (virtualenv installation type)"
 arch=('any')
 url="http://octoprint.org/"
@@ -16,10 +16,12 @@ conflicts=('octoprint')
 install="octoprint.install"
 source=("https://github.com/foosel/OctoPrint/archive/${pkgver}.tar.gz"
         'octoprint.service'
-        'octoprint.sysusers')
+        'octoprint.sysusers'
+        'octoprint.tmpfiles')
 sha256sums=('ca1bc5352ef20778722a6b2aedef4c8dbe28d0d82c2526f84f3db07245a01aad'
             '7f7aa02075901d7501a03bda082f050ba5862e58034f0216b5a76d2a25135d3a'
-            '79d0f9fe053181eaa77f472b5235463ce217475d47fada9869f42d313b4651a9')
+            '79d0f9fe053181eaa77f472b5235463ce217475d47fada9869f42d313b4651a9'
+            'ff05d3e76a59f23f2d06d318f8bac1bf5797fafe1c86c45de0249983d2072c25')
 
 
 package() {
@@ -29,8 +31,9 @@ package() {
     ${pkgdir}/opt/$pkgname/bin/python2 setup.py install --optimize=1
     sed -i "s|${pkgdir}/opt/$pkgname|/opt/$pkgname|g" ${pkgdir}/opt/$pkgname/bin/* # relocate without breaking plugin system
     
-    install -D -m644 ${srcdir}/octoprint.service ${pkgdir}/usr/lib/systemd/system/octoprint.service
+    install -Dm644 ${srcdir}/octoprint.service ${pkgdir}/usr/lib/systemd/system/octoprint.service
     install -Dm644 ${srcdir}/octoprint.sysusers $pkgdir/usr/lib/sysusers.d/octoprint.conf
+    install -Dm644 ${srcdir}/octoprint.tmpfiles $pkgdir/usr/lib/tmpfiles.d/octoprint.conf
     
     install -d ${pkgdir}/usr/bin/
     ln -s /opt/$pkgname/bin/octoprint ${pkgdir}/usr/bin/octoprint
diff --git a/octoprint.install b/octoprint.install
index f5ce9eb464c2..66fe9c1af0fd 100755
--- a/octoprint.install
+++ b/octoprint.install
@@ -1,18 +1,3 @@
-post_install() {
-	systemd-sysusers #Trigger sysusers before chown
-	chown -R octoprint:octoprint /var/lib/octoprint
-	chown -R octoprint:octoprint /opt/octoprint-venv
-
-	echo "To start octoprint, run: systemctl start octoprint"
-	echo "To enable octoprint at boot, run: systemctl enable octoprint"
-}
-
-post_upgrade() {
- 	post_install $1
-}
-
 post_remove() {
-	echo "To stop octoprint, run: systemctl stop octoprint"
-	echo "To disable octoprint at boot, run: systemctl disable octoprint"
  	echo "You may want to remove the octoprint user directory (/var/lib/octoprint)"
 }
diff --git a/octoprint.tmpfiles b/octoprint.tmpfiles
new file mode 100644
index 000000000000..8b9b01ceacdc
--- /dev/null
+++ b/octoprint.tmpfiles
@@ -0,0 +1,2 @@
+D    /var/lib/octoprint - octoprint octoprint - -
+Z    /opt/octoprint-venv - octoprint octoprint - -