add tornado user

celogeek · Jan 11, 2020 · 67fd452 · 67fd452
1 parent ffeda7e
commit 67fd452
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/PKGBUILD b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=octoprint-tornado
 pkgver=20200111
-pkgrel=8
+pkgrel=11
 pkgdesc="control my tornado installation"
 arch=(any)
 depends=(haproxy octoprint-venv mjpg-streamer-git)
@@ -11,14 +11,16 @@ source=(
 	octoprint-proxy.service
 	octoprint-web.service
 	octoprint-webcam.service
+	octoprint-klipper.service
 )
 
-sha256sums=('7a8c2f7dba7e491a81d373748943bd01720fb6b43adc471b49e540890c62bdfe'
-            'e297c44df2a0787dac8c42850cd31b447752f53f45aac2aad0efea6b9872e308'
+sha256sums=('92a69198ae6c6207f41ae01812c6a4b9a84bb9a0932421be60c0058d245389f2'
+            '872fc25ccd5b3b3f4aa3b8b316d32cbd17ab6be6a3bb5ff47aff16dbc8a71608'
             '47546d4400ca02c73da3698e4b27cef87cdb64c05f45a613b4a5fdad6e17d763'
             'e6562a0aba61172fcef3615320c881a3c7a2022b5f86ce43fd2de1f576533c6b'
-            '5b9dbc7aba988974367e272d9a9f1701472c10ef4c316121e2d821405fc1d3da'
-            '5159287dc4fcadba54f501aed56c73374648ccfdb4553b532fa75fd0b24fcb3b')
+            '01661fd788379435ae311729422283b8abeea58e2cd69478c975c608d8fbcd91'
+            '5159287dc4fcadba54f501aed56c73374648ccfdb4553b532fa75fd0b24fcb3b'
+            '3246342ea0cc07ac2a580c222efd9310f13c05663fa55165a9ae82721385dae6')
 
 install=$pkgname.install
 

diff --git a/octoprint-klipper.service b/octoprint-klipper.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=3D printer firmware with motion planning on the host
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+User=klipper
+RemainAfterExit=yes
+ExecStart=/usr/bin/python2 /opt/klipper/klippy/klippy.py /etc/octoprint-tornado/klipper.cfg -I /run/klipper/sock
+Restart=always
+RestartSec=10
diff --git a/octoprint-web.service b/octoprint-web.service
@@ -6,7 +6,7 @@ After=network.target
 User=octoprint
 Group=octoprint
 Type=simple
-ExecStart=/usr/bin/octoprint serve --host 127.0.0.1 --port 5000 -b /var/lib/octoprint-tornado -c /etc/octoprint-tornado/config.yaml
+ExecStart=/usr/bin/octoprint serve --host 127.0.0.1 --port 5000 -b /var/lib/octoprint-tornado -c /etc/octoprint-tornado/web.yaml
 Restart=on-failure
 
 [Install]

diff --git a/sysusers.conf b/sysusers.conf
@@ -1,2 +1,6 @@
 u mjpg-streamer - "Webcam Streamer" /opt/mjpg-streamer
 m mjpg-streamer video
+
+u octoprint-tornado - "tornado configs" /opt/octoprint-tornado
+m octoprint octoprint-tornado
+m klipper octoprint-tornado
diff --git a/tmpfiles.conf b/tmpfiles.conf
@@ -1,3 +1,3 @@
-d /etc/octoprint-tornado 0755 octoprint octoprint - -
-z /etc/octoprint-tornado/config.yml 0644 octoprint octoprint - -
-d /var/lib/octoprint-tornado 0755 octoprint octoprint - -
+d /etc/octoprint-tornado 0775 octoprint-tornado octoprint-tornado - -
+d /var/lib/octoprint-tornado 0755 octoprint-tornado octoprint-tornado - -
+Z /etc/octoprint-tornado 775 - octoprint-tornado - -