Removed use of synapse user. Added upstream url. Updated package description.

5 files changed, 32 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c412031c7f74..ed1ba578719a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = matrix-puppet-hangouts-git
-	pkgdesc = Single user Node.js Hangouts bridge for Matrix-Synapse <1.10.x
+	pkgdesc = Unmaintained, single user Node.js Hangouts bridge for Matrix-Synapse <1.10.x
 	pkgver = r57.b055642
-	pkgrel = 2
+	pkgrel = 3
+	url = https://github.com/matrix-hacks/matrix-puppet-hangouts
 	arch = any
 	license = Apache
 	makedepends = npm
@@ -17,13 +18,17 @@ pkgbase = matrix-puppet-hangouts-git
 	source = setup.sh
 	source = config-paths.patch
 	source = hangups_manual_login.py
+	source = sysusers-matrix-hangouts.conf
+	source = tmpfiles-matrix-hangouts.conf
 	source = matrix-puppet-hangouts@.service
-	sha256sums = SKIP
-	sha256sums = 69aaa542079a8fa4a4ac73a0598acef5d2991a24b657af987c13014ee96e21e0
-	sha256sums = 19bc3e24513c0c580dc862f2fc14f40baff9b4d2b09280586014042af32881bf
-	sha256sums = 7e17b23c7f23558e1cdee0bd3e3c0820c91ac1f05a2b7ce7edcbc750413aa371
-	sha256sums = 39ef6f75eed3c743bafc3974e83a8916446120985a5e2b39f9c6aa70abfbe585
-	sha256sums = e80f54718c308237eeae039326c69e6b599c6578db3ed72ab7b79d2f8e1c38d6
+	md5sums = SKIP
+	md5sums = 0d02b2c6ff05a1477e3e65aa242b064c
+	md5sums = 09214cd85350e18a0ba2bb38c8420005
+	md5sums = 1fa946f5f038d84121bea3d3e3b915ee
+	md5sums = 7dd4e8eae5064114ff5f85bb94ce21c0
+	md5sums = 5c2a8067f31008533e7c99817d8c7f7e
+	md5sums = 6c86d68053b5c9eaab4559d2877857cc
+	md5sums = a25c1e7dffb9fb2684387009bf55a847
 
 pkgname = matrix-puppet-hangouts-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 53dc2d5b282f..01380fd428cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,15 @@
 _pkgbase=matrix-puppet-hangouts
 pkgname=${_pkgbase}-git
 pkgver=r57.b055642
-pkgrel=2
-pkgdesc="Single user Node.js Hangouts bridge for Matrix-Synapse <1.10.x"
+pkgrel=3
+pkgdesc="Unmaintained, single user Node.js Hangouts bridge for Matrix-Synapse <1.10.x"
 arch=(any)
 conflicts=(matrix-puppet-hangouts
 	       'matrix-synapse>=1.10.0')
 license=(Apache)
 depends=(nodejs hangups-git)
 makedepends=(npm git)
+url="https://github.com/matrix-hacks/matrix-puppet-hangouts"
 optdepends=('python: for maintenance scripts'
 	        'matrix-synapse<1.10.0: if also hosting a homeserver'
            )
@@ -19,13 +20,17 @@ source=("${_pkgbase}::git+https://github.com/matrix-hacks/${_pkgbase}"
 	   "setup.sh"
 	   "config-paths.patch"
 	   "hangups_manual_login.py"
+	    "sysusers-matrix-hangouts.conf"
+	    "tmpfiles-matrix-hangouts.conf"
 	   "${_pkgbase}@.service")
-sha256sums=('SKIP'
-            '69aaa542079a8fa4a4ac73a0598acef5d2991a24b657af987c13014ee96e21e0'
-            '19bc3e24513c0c580dc862f2fc14f40baff9b4d2b09280586014042af32881bf'
-            '7e17b23c7f23558e1cdee0bd3e3c0820c91ac1f05a2b7ce7edcbc750413aa371'
-            '39ef6f75eed3c743bafc3974e83a8916446120985a5e2b39f9c6aa70abfbe585'
-            'e80f54718c308237eeae039326c69e6b599c6578db3ed72ab7b79d2f8e1c38d6')
+md5sums=('SKIP'
+         '0d02b2c6ff05a1477e3e65aa242b064c'
+         '09214cd85350e18a0ba2bb38c8420005'
+         '1fa946f5f038d84121bea3d3e3b915ee'
+         '7dd4e8eae5064114ff5f85bb94ce21c0'
+         '5c2a8067f31008533e7c99817d8c7f7e'
+         '6c86d68053b5c9eaab4559d2877857cc'
+         '2d9a363877fef22a7fae46fef7669abf')
 
 pkgver() {
   cd "$srcdir/${_pkgbase}"
@@ -53,11 +58,6 @@ package() {
   cp -r * "${pkgdir}"/usr/lib/node_modules/${_pkgbase}/
   chmod -R go-w "${pkgdir}"/usr/lib/
   chown -R root:root "${pkgdir}"/usr
-  mkdir -p "${pkgdir}"/var/lib/${_pkgbase}/
- # touch "${pkgdir}"/var/lib/${_pkgbase}/.pkg
-  chmod -R go-w "${pkgdir}"/var/lib/
-  chown -R root:root "${pkgdir}"/var
-  chown -R synapse:synapse "${pkgdir}"/var/lib/${_pkgbase}
 
   #TODO: make synapse user and chown these files so we aren't dependent on synapse package
   mkdir -p "${pkgdir}"/etc/synapse/"${_pkgbase}"/
@@ -68,4 +68,6 @@ package() {
   install -Dm644 README -t "${pkgdir}"/etc/synapse/"${_pkgbase}"/
   install -Dm644 setup.sh -t "${pkgdir}"/etc/synapse/"${_pkgbase}"/
   install -Dm644 ${_pkgbase}@.service -t  "${pkgdir}"/usr/lib/systemd/system/
+  install -Dm644 "$srcdir"/sysusers-matrix-hangouts.conf "$pkgdir"/usr/lib/sysusers.d/matrix-puppet-hangouts.conf
+  install -Dm644 "$srcdir"/tmpfiles-matrix-hangouts.conf "$pkgdir"/usr/lib/tmpfiles.d/matrix-puppet-hangouts.conf
 }
diff --git a/matrix-puppet-hangouts@.service b/matrix-puppet-hangouts@.service
index f09ceacf1d1e..3c6844614a86 100644
--- a/matrix-puppet-hangouts@.service
+++ b/matrix-puppet-hangouts@.service
@@ -7,8 +7,8 @@ Description=Hangouts Matrix Puppet
 Type=simple
 Environment=DEBUG=verbose:matrix-puppet:*
 Environment=HOME=/var/lib/matrix-puppet-hangouts/%i/
-User=synapse
-Group=synapse
+User=matrix-hangouts
+Group=matrix-hangouts
 WorkingDirectory=/var/lib/matrix-puppet-hangouts/%i/
 ExecStart=/usr/bin/node /usr/lib/node_modules/matrix-puppet-hangouts/index.js
 Restart=always
diff --git a/sysusers-matrix-hangouts.conf b/sysusers-matrix-hangouts.conf
new file mode 100644
index 000000000000..3b44b4a130c1
--- /dev/null
+++ b/sysusers-matrix-hangouts.conf
@@ -0,0 +1 @@
+u matrix-hangouts 198 "Matrix Puppet Hangouts user" /var/lib/matrix-puppet-hangouts
diff --git a/tmpfiles-matrix-hangouts.conf b/tmpfiles-matrix-hangouts.conf
new file mode 100644
index 000000000000..23f94dc13002
--- /dev/null
+++ b/tmpfiles-matrix-hangouts.conf
@@ -0,0 +1 @@
+d /var/lib/matrix-puppet-hangouts 0700 mautrix-hangouts mautrix-hangouts -