[arch-commits] Commit in loki/trunk (PKGBUILD promtail.service promtail.tmpfiles)

[Jelle van der Waa]

    Date: Sunday, January 26, 2020 @ 20:40:47
  Author: jelle
Revision: 373974

let promtail run as promtail user

Added:
  loki/trunk/promtail.tmpfiles
Modified:
  loki/trunk/PKGBUILD
  loki/trunk/promtail.service

-------------------+
 PKGBUILD          |    8 ++++++--
 promtail.service  |    1 +
 promtail.tmpfiles |    1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-26 18:29:44 UTC (rev 373973)
+++ PKGBUILD	2020-01-26 20:40:47 UTC (rev 373974)
@@ -10,9 +10,11 @@
 depends=('glibc')
 makedepends=('go-pie')
 backup=('etc/loki/loki.yaml' 'etc/loki/promtail.yaml')
-source=($pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/v$pkgver.tar.gz promtail.sysusers)
+source=($pkgname-$pkgver.tar.gz::https://github.com/grafana/loki/archive/v$pkgver.tar.gz promtail.sysusers promtail.service promtail.tmpfiles)
 sha512sums=('db2c5e81b2b24d884f2c56531e577beae693cc06e30fe74b4d89b6b1c3857992396aeb46877ab5b787b268741cc9de75fd5ed53c548de6abac701afe97477df2'
-            '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74')
+            '2b6c44b18ea3c9f955a7450222180d0b20b5fc551d0b7e5d0d8949e40adc847c4166829146260f87a75732cc5473eab0347dd56fc2125517698bac0652738c74'
+            'a3d08bffb40b496d020bde93cc7a76e315e35aa8d3372585fe49de9e916759e0b904148f3a0d89b832fabceb83ef129ad0c455dea8bc476f4cdf7e4c7ef7a53b'
+            '598042c40673a7914c5a1eeccfb78f832379a61f4360212c5d86f667343cf2fc78e98d9025f9717ea64f3e16e0a28f08cd7709706d811656722019f6167dd788')
 
 build() {
   cd loki-$pkgver
@@ -50,4 +52,6 @@
   install -Dm644 cmd/loki/loki-local-config.yaml $pkgdir/etc/loki/loki.yaml
 
   install -Dm644 ${srcdir}/promtail.sysusers "$pkgdir/usr/lib/sysusers.d/promtail.conf"
+  install -Dm644 ${srcdir}/promtail.service "$pkgdir/usr/lib/systemd/system/promtail.service"
+  install -Dm644 ${srcdir}/promtail.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/promtail.conf"
 }

Modified: promtail.service
===================================================================
--- promtail.service	2020-01-26 18:29:44 UTC (rev 373973)
+++ promtail.service	2020-01-26 20:40:47 UTC (rev 373974)
@@ -5,6 +5,7 @@
 [Service]
 Type=simple
 ExecStart=/usr/bin/promtail -positions.file /var/lib/promtail/positions.yml -config.file /etc/loki/promtail.yaml
+User=promtail
 TimeoutStopSec=30s
 
 NoNewPrivileges=true

Added: promtail.tmpfiles
===================================================================
--- promtail.tmpfiles	                        (rev 0)
+++ promtail.tmpfiles	2020-01-26 20:40:47 UTC (rev 373974)
@@ -0,0 +1 @@
+d /var/lib/promtail 0750 promtail promtail -