diff options
| author | BrainDamage | 2020-11-10 01:56:30 +0100 |
|---|---|---|
| committer | BrainDamage | 2020-11-10 01:56:30 +0100 |
| commit | b652419101b6bfb54c027f750ee19b9f8d6814e5 (patch) | |
| tree | fc2ef4cd798db7f2a2139b67357185466d227091 | |
| parent | 37712eb826ddcaece17a03f191f6284320ffb039 (diff) | |
| download | aur-b652419101b6bfb54c027f750ee19b9f8d6814e5.tar.gz | |
fixed a nasty typo in the post_install instructions
added an empty stub registration file so that the file gets the right permissions from the start, so the secret keys are never world readable
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 8 | ||||
| -rw-r--r-- | mautrix-telegram.install | 4 |
3 files changed, 9 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = mautrix-telegram pkgdesc = A Matrix-Telegram hybrid puppeting/relaybot bridge. pkgver = 0.8.2 - pkgrel = 5 + pkgrel = 6 url = https://github.com/tulir/mautrix-telegram install = mautrix-telegram.install arch = any @@ -28,6 +28,7 @@ pkgbase = mautrix-telegram optdepends = python-psycopg2: postgresql database support optdepends = python-matrix-nio: end-to-bridge encryption support backup = etc/mautrix-telegram/config.yaml + backup = etc/mautrix-telegram/registration.yaml source = https://github.com/tulir/mautrix-telegram/archive/v0.8.2.tar.gz source = mautrix-telegram.service source = mautrix-telegram.sysusers @@ -1,7 +1,7 @@ # Maintainer: BrainDamage pkgname=mautrix-telegram pkgver=0.8.2 -pkgrel=5 +pkgrel=6 pkgdesc="A Matrix-Telegram hybrid puppeting/relaybot bridge." url="https://github.com/tulir/mautrix-telegram" depends=('python' 'python-sqlalchemy' 'python-alembic' 'python-ruamel-yaml' @@ -24,7 +24,7 @@ sha256sums=('1f227f50e84f643fc7633f1a8f336aa1e51db6c12628e983783c2995a41d497f' '7d947a08bff4bf172346682d68af6071e5df556d16065b439aa312edc57e5e84' 'fce0a4f792e62d9440fe431fb6ab6c458139bcc801bc2b02bc1b3d8f2ff9fcbf' 'e6d4565350477d180c639cc1e0805d475ef036e870db671b22374e9c91f95c7c') -backup=("etc/${pkgname}/config.yaml") +backup=("etc/${pkgname}/config.yaml" "etc/${pkgname}/registration.yaml") install="${pkgname}.install" @@ -35,6 +35,9 @@ prepare() { # to prevent a nightmare during updates while tracking stable releases sed -i -E 's/,?<[[:digit:]]*\.?[[:digit:]]+,?//g' requirements.txt sed -i -E 's/,?<[[:digit:]]*\.?[[:digit:]]+,?//g' optional-requirements.txt + # create an empty registration file so that permissions get written properly from the get go + # this way secret keys are never world readable + touch registration.yaml } build() { @@ -62,4 +65,5 @@ package() { install -Dvm 644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" install -Dvm 640 "${pkgdir}${_shared_dir}/example-config.yaml" "${pkgdir}/etc/${pkgname}/config.yaml" + install -Dvm 640 registration.yaml "${pkgdir}/etc/${pkgname}/registration.yaml" } diff --git a/mautrix-telegram.install b/mautrix-telegram.install index d841ff32ac1a..57dce084b8a9 100644 --- a/mautrix-telegram.install +++ b/mautrix-telegram.install @@ -1,8 +1,6 @@ post_install() { cat <<- 'EOF' after editing /etc/mautrix-telegram/config.yaml, generate a registration file using: - # mautrix-telegram -b /etc/mautrix-telegram/config.yaml -c /usr/share/mautrix-telegram/example-config.yaml -r /etc/mautrix-telegram/registration.yaml -g - then update the permissions/ownership using: - # systemd-tmpfiles --create --prefix /etc/mautrix-telegram + # mautrix-telegram -b /usr/share/mautrix-telegram/example-config.yaml -c /etc/mautrix-telegram/config.yaml -r /etc/mautrix-telegram/registration.yaml -g EOF } |