Update to version 0.2.1

5 files changed, 26 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 06a9fece980a..521e8ea3a7ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Frédéric Tobias Christ <dev+mautrix-signal@ntr.li> <ftchrist:matrix.org>
 pkgname='mautrix-signal'
-pkgver=0.1.1
-pkgrel=2
+pkgver=0.2.1
+pkgrel=1
 pkgdesc="A Matrix-Signal puppeting bridge"
 arch=('any')
 url="https://github.com/tulir/mautrix-signal"
 license=('AGPLv3')
-depends=('python-aiohttp>=3' 'python-asyncpg>=0.20' 'python-attrs>=19.1' 'python-commonmark>=0.8' 'python-mautrix' 'python-magic>=0.4' 'python-ruamel-yaml>=0.15.35' 'signald>=0.13.1' 'python-yarl>=1' )
+depends=('python-aiohttp>=3' 'python-asyncpg>=0.20' 'python-attrs>=19.1' 'python-commonmark>=0.8' 'python-mautrix' 'python-magic>=0.4' 'python-ruamel-yaml>=0.15.35' 'signald>=0.15' 'python-yarl>=1' )
 makedepends=('python-setuptools')
 #checkdepends
 optdepends=(
@@ -21,11 +21,13 @@ optdepends=(
 backup=("etc/${pkgname}/config.yaml")
 install="${pkgname}.install"
 source=( "${url}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.service" "${pkgname}.sysusers" "${pkgname}.tmpfiles")
-sha256sums=('92b85eab45d9d2d165298b114a5ee47bb89f93a2c6bfa7a30a3d6a1bac4870b3'
-            'd916d5fbe521416bd5a52e1f27da87e45a0f4206801173f2b86e6d63f62c3b34'
-            '807da72f363ce3850e1bf98b3d3a7a00bf174a1035c91a853861fcc6b5f499fc'
-            'b515feb2b6fd37f2b0e9e3a16d64c73b22fa12b4a8af8b13f212f1da02817f81')
+sha256sums=('68ea168db3d7a99b52f84a9d1d6f96bf914e31a5787b6d4d97923974156a09c4'
+            '87a479c5216fa79dbe20ff776f67f5ab70ad0f9705da4b274cc662003545c4be'
+            '3203dcff48579a2420eff4289a03ea1b3a9f47031c39f514e8c9a2d119625725'
+            '5badc8727dfbf4531f93e86ae475c64753952ee60090a043be22b9dd9a124ca5')
+
 prepare() {
+    mv "${srcdir}/signal-${pkgver}" "${srcdir}/${pkgname}-${pkgver}"
     cd "${srcdir}/${pkgname}-${pkgver}"
     touch registration.yaml
 }
diff --git a/mautrix-signal.install b/mautrix-signal.install
index 7cf7561ad0ff..b02abf78a6ae 100644
--- a/mautrix-signal.install
+++ b/mautrix-signal.install
@@ -1,8 +1,17 @@
 post_install() {
 	cat <<- 'EOF'
+		##################################
+		#    Installation instructions   #
+		##################################
 		See: https://docs.mau.fi/bridges/python/setup/index.html?bridge=signal
-		after editing /etc/mautrix-signal/config.yaml, generate a registration file using:
+		## config.yaml
+		Make sure to set 
+		- avatar_dir: /var/lib/signald/avatars
+        - data_dir: /var/lib/signald/data
+		After editing /etc/mautrix-signal/config.yaml, generate a registration file using:
 		# python -m mautrix_signal -b /usr/share/mautrix-signal/example-config.yaml -c /etc/mautrix-signal/config.yaml -r /etc/mautrix-signal/registration.yaml -g
-		Add the path to the registration file (registration.yaml by default) to your Synapse's homeserver.yaml under app_service_config_files. Restart Synapse to apply changes.
+		Add the path to the registration file ("/etc/mautrix-signal/registration.yaml" by default) to your Synapse's homeserver.yaml under app_service_config_files. Restart Synapse to apply changes.
+		If you encounter an error like "cannot write tmp file, start the bridge once manually as root and check the file permissions on the config files afterwards:
+		# sudo -u mautrix-signal python -m mautrix_signal -b /usr/share/mautrix-signal/example-config.yaml -c /etc/mautrix-signal/config.yaml -r /etc/mautrix-signal/registration.yaml
 	EOF
 }
diff --git a/mautrix-signal.service b/mautrix-signal.service
index d01094e09f40..0e0cddc9c3a1 100644
--- a/mautrix-signal.service
+++ b/mautrix-signal.service
@@ -8,7 +8,6 @@ User=mautrix-signal
 WorkingDirectory=~
 ExecStart=python -m mautrix_signal -b /usr/share/mautrix-signal/example-config.yaml -c /etc/mautrix-signal/config.yaml -r /etc/mautrix-signal/registration.yaml
 
-
 Restart=on-failure
 RestartSec=30s
 
diff --git a/mautrix-signal.sysusers b/mautrix-signal.sysusers
index 1a5e544543b2..25211e079f8e 100644
--- a/mautrix-signal.sysusers
+++ b/mautrix-signal.sysusers
@@ -1,2 +1,3 @@
-# Type Name      ID  GECOS                              Home                    Shell
-u mautrix-signal -   "A Matrix-Signal puppeting bridge" /var/lib/mautrix-signal -
+# Type Name      ID      GECOS                              Home                    Shell
+u mautrix-signal -       "A Matrix-Signal puppeting bridge" /var/lib/mautrix-signal -
+m mautrix-signal signald
diff --git a/mautrix-signal.tmpfiles b/mautrix-signal.tmpfiles
index 907774638698..9a35213e9728 100644
--- a/mautrix-signal.tmpfiles
+++ b/mautrix-signal.tmpfiles
@@ -1,3 +1,3 @@
-# Type Path               Mode User           Group          Age Argument...
-z /etc/mautrix-signal/*   640  mautrix-signal mautrix-signal -
-d /var/lib/mautrix-signal 700  mautrix-signal mautrix-signal -
+# Type Path               Mode User           Group          Age Argument
+z /etc/mautrix-signal/*   740  mautrix-signal mautrix-signal -   -
+d /var/lib/mautrix-signal 700  mautrix-signal mautrix-signal -   -