summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Murray2020-09-17 08:50:05 +0100
committerMatthew Murray2020-09-17 08:50:52 +0100
commit381a2f869bd931ae5cedef3731a91d46077cf99f (patch)
tree2fef0bec102650454f332eb32d3914c636e5b3c1
parent32ca821ce0603b77deb3c40154a660be86fb0ab3 (diff)
downloadaur-381a2f869bd931ae5cedef3731a91d46077cf99f.tar.gz
Set default log path to /var/log/mautrix-whatsapp
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--log-path.diff13
-rw-r--r--mautrix-whatsapp.tmpfiles1
4 files changed, 26 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d4e9300e2a42..9b3c50163861 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mautrix-whatsapp
pkgdesc = A Matrix-WhatsApp puppeting bridge
pkgver = 0.1.4
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/tulir/mautrix-whatsapp
arch = any
license = AGPL
@@ -14,10 +14,12 @@ pkgbase = mautrix-whatsapp
source = sysusers-mautrix-whatsapp.conf
source = mautrix-whatsapp.tmpfiles
source = mautrix-whatsapp.service
+ source = log-path.diff
md5sums = e9b863d139ff5ed024bec13413087c0a
md5sums = f1fea8f4fcd101f1230031652de1c53c
- md5sums = ef8e104e27e1576429e364252e2005b0
+ md5sums = 6e1e73d152d8a459541fcb6c79654c4a
md5sums = 01bd1d42f312bebfeec6f8a71e714d1d
+ md5sums = 9b4a4e7d6265ecc83cdaa83a03f1bd5b
pkgname = mautrix-whatsapp
diff --git a/PKGBUILD b/PKGBUILD
index 5ab3c544d5bc..a1effe83520f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Matthew Murray <matt@compti.me>
pkgname=mautrix-whatsapp
pkgver=0.1.4
-pkgrel=2
+pkgrel=3
pkgdesc="A Matrix-WhatsApp puppeting bridge"
arch=('any')
license=('AGPL')
@@ -12,15 +12,19 @@ url="https://github.com/tulir/${pkgname}"
source=("${url}/archive/v${pkgver}.tar.gz"
sysusers-mautrix-whatsapp.conf
mautrix-whatsapp.tmpfiles
- mautrix-whatsapp.service)
+ mautrix-whatsapp.service
+ log-path.diff)
backup=("etc/${pkgname}/mautrix-whatsapp.yaml")
md5sums=('e9b863d139ff5ed024bec13413087c0a'
'f1fea8f4fcd101f1230031652de1c53c'
- 'ef8e104e27e1576429e364252e2005b0'
- '01bd1d42f312bebfeec6f8a71e714d1d')
+ '6e1e73d152d8a459541fcb6c79654c4a'
+ '01bd1d42f312bebfeec6f8a71e714d1d'
+ '9b4a4e7d6265ecc83cdaa83a03f1bd5b')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 < "$srcdir/log-path.diff"
+
export CGO_CPPFLAGS="${CPPFLAGS}"
export CGO_CFLAGS="${CFLAGS}"
export CGO_CXXFLAGS="${CXXFLAGS}"
diff --git a/log-path.diff b/log-path.diff
new file mode 100644
index 000000000000..2744077a488b
--- /dev/null
+++ b/log-path.diff
@@ -0,0 +1,13 @@
+diff --git a/example-config.yaml b/example-config.yaml
+index d496ae4..7d8346d 100644
+--- a/example-config.yaml
++++ b/example-config.yaml
+@@ -241,7 +241,7 @@ bridge:
+ # Logging config.
+ logging:
+ # The directory for log files. Will be created if not found.
+- directory: ./logs
++ directory: /var/log/mautrix-whatsapp
+ # Available variables: .Date for the file date and .Index for different log files on the same day.
+ file_name_format: "{{.Date}}-{{.Index}}.log"
+ # Date format for file names in the Go time format: https://golang.org/pkg/time/#pkg-constants
diff --git a/mautrix-whatsapp.tmpfiles b/mautrix-whatsapp.tmpfiles
index 9cff58fdf32c..190a4b2591b8 100644
--- a/mautrix-whatsapp.tmpfiles
+++ b/mautrix-whatsapp.tmpfiles
@@ -1,3 +1,4 @@
# 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 -
+d /var/log/mautrix-whatsapp - mautrix-whatsapp mautrix-whatsapp