mautrix-whatsapp user & /etc/mautrix-whatsapp dir

6 files changed, 25 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0b5e74cb365..94c6ba4b4a36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = mautrix-whatsapp
 	pkgdesc = A Matrix-WhatsApp puppeting bridge
 	pkgver = 0.1.3
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/tulir/mautrix-whatsapp
-	install = mautrix-whatsapp.install
 	arch = any
 	license = AGPL
 	makedepends = go
@@ -11,9 +10,13 @@ pkgbase = mautrix-whatsapp
 	optdepends = ffmpeg: If you want to send gifs from Matrix
 	optdepends = libolm: If you want end-to-bridge encryption
 	source = https://github.com/tulir/mautrix-whatsapp/archive/v0.1.3.tar.gz
+	source = sysusers-mautrix-whatsapp.conf
+	source = mautrix-whatsapp.tmpfiles
 	source = mautrix-whatsapp.service
 	md5sums = 671ad744ec61e065ab5dabc6426eeebd
-	md5sums = 052bb6a4ca9945799051560a7c5ed5d2
+	md5sums = f1fea8f4fcd101f1230031652de1c53c
+	md5sums = ef8e104e27e1576429e364252e2005b0
+	md5sums = 01bd1d42f312bebfeec6f8a71e714d1d
 
 pkgname = mautrix-whatsapp
 
diff --git a/PKGBUILD b/PKGBUILD
index 00a38a0f3ab9..bad07d103bca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
 # Maintainer: Matthew Murray <matt@compti.me>
 pkgname=mautrix-whatsapp
 pkgver=0.1.3
-pkgrel=3
+pkgrel=4
 pkgdesc="A Matrix-WhatsApp puppeting bridge"
 arch=('any')
 license=('AGPL')
 makedepends=(go libolm)
 optdepends=('ffmpeg: If you want to send gifs from Matrix'
             'libolm: If you want end-to-bridge encryption')
-install=mautrix-whatsapp.install
 url="https://github.com/tulir/${pkgname}"
 source=("${url}/archive/v${pkgver}.tar.gz" 
+        sysusers-mautrix-whatsapp.conf
+        mautrix-whatsapp.tmpfiles
         mautrix-whatsapp.service)
 md5sums=('671ad744ec61e065ab5dabc6426eeebd'
-         '052bb6a4ca9945799051560a7c5ed5d2')
+         'f1fea8f4fcd101f1230031652de1c53c'
+         'ef8e104e27e1576429e364252e2005b0'
+         '01bd1d42f312bebfeec6f8a71e714d1d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,8 +31,12 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 "example-config.yaml" "$pkgdir/usr/share/$pkgname/example-config.yaml"
-  install -Dm644 "$srcdir/mautrix-whatsapp.service" "$pkgdir/usr/share/$pkgname/mautrix-whatsapp.service"
+
+  install -Dm644 "$srcdir/sysusers-mautrix-whatsapp.conf" "$pkgdir/usr/lib/sysusers.d/mautrix-whatsapp.conf"
+  install -Dm644 "$srcdir/mautrix-whatsapp.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/mautrix-whatsapp.conf"
+
+  install -Dm600 "example-config.yaml" "$pkgdir/etc/$pkgname/mautrix-whatsapp.yaml"
+  install -Dm644 "$srcdir/mautrix-whatsapp.service" "$pkgdir/usr/lib/systemd/system/mautrix-whatsapp.service"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/mautrix-whatsapp.install b/mautrix-whatsapp.install
deleted file mode 100644
index 2f46af79bb76..000000000000
--- a/mautrix-whatsapp.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-  echo "-- See example config and service files: /usr/share/mautrix-whatsapp/"
-}
diff --git a/mautrix-whatsapp.service b/mautrix-whatsapp.service
index 1a387122ea9d..19897f894cf4 100644
--- a/mautrix-whatsapp.service
+++ b/mautrix-whatsapp.service
@@ -5,9 +5,9 @@ Requires=network-online.target
 
 [Service]
 Type=simple
-User=synapse
-Group=synapse
-ExecStart=/usr/bin/mautrix-whatsapp -c /etc/synapse/mautrix-whatsapp/mautrix-whatsapp.yaml
+User=mautrix-whatsapp
+Group=mautrix-whatsapp
+ExecStart=/usr/bin/mautrix-whatsapp -c /etc/mautrix-whatsapp/mautrix-whatsapp.yaml
 
 [Install]
 WantedBy=multi-user.target
diff --git a/mautrix-whatsapp.tmpfiles b/mautrix-whatsapp.tmpfiles
new file mode 100644
index 000000000000..9cff58fdf32c
--- /dev/null
+++ b/mautrix-whatsapp.tmpfiles
@@ -0,0 +1,3 @@
+# Override this file with a modified version in /etc/tmpfiles.d/
+d /etc/mautrix-whatsapp 0755 mautrix-whatsapp mautrix-whatsapp -
+Z /etc/mautrix-whatsapp - mautrix-whatsapp mautrix-whatsapp -
diff --git a/sysusers-mautrix-whatsapp.conf b/sysusers-mautrix-whatsapp.conf
new file mode 100644
index 000000000000..a167240e0ea4
--- /dev/null
+++ b/sysusers-mautrix-whatsapp.conf
@@ -0,0 +1 @@
+u mautrix-whatsapp - "Mautrix Whatsapp user"