diff options
| author | Óscar García Amor | 2023-11-14 17:43:43 +0100 |
|---|---|---|
| committer | Óscar García Amor | 2023-11-14 17:43:43 +0100 |
| commit | 6a3d0ab3ff41f25fa3b5199cf2d8bacbee19d956 (patch) | |
| tree | f2713acc8edb03963eaa06bb5436a08f909d3de7 | |
| parent | 40aeb70759df5e4241e516b80aaecf4ccece09cb (diff) | |
| download | aur-6a3d0ab3ff41f25fa3b5199cf2d8bacbee19d956.tar.gz | |
upgpkg: telegraf 1.28.3-1
Improves telegraf.service and change to DynamicUser
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | telegraf.install | 3 | ||||
| -rw-r--r-- | telegraf.service | 7 | ||||
| -rw-r--r-- | telegraf.sysusers | 1 | ||||
| -rw-r--r-- | telegraf.tmpfiles | 1 |
7 files changed, 12 insertions, 26 deletions
@@ -18,12 +18,8 @@ pkgbase = telegraf source = https://github.com/influxdata/telegraf/archive/v1.28.3/telegraf-v1.28.3.tar.gz source = telegraf.install source = telegraf.service - source = telegraf.sysusers - source = telegraf.tmpfiles b2sums = 3a8d21309e66f6129824ae82f3acae97a69312281152d9778b11fef8c88910d6ddb4c93a8ea4d2e575e3b2431879dd25ade01a3c01efdf428f8e331871d8bb1b - b2sums = a99e279fa6057b64b8a531922b9ce249fccea86b777686966932b6101923aaa9bacfe51d14dd2ef3168217b0d2d76fd06ce8ff50ae27d19fee69fcad975a83a9 - b2sums = a0ea1bf213d10a6186993a48e6a8ca0ab70e3a949d85d0f7b881baeea3d051d05596863f1cef28ad83b0d2bc976a101014d7c04ae17a3ce2b98ce73b2b205826 - b2sums = aac77720058d91abbe0ad28dadeb429a812e94c970c29491d787f039aece4a6401e8d52aa8c31b439771e8c31aed97cd822f1d4730eaa86fdff7140a0f45e143 - b2sums = 16df3d7a60cf88f979c48983e0bba099cc6c270f173b5caf9716c51b5545cf4d6494141d8e068e8ab39dacb6f3e6ca54c30aea619854ac752d804244b5a1cc21 + b2sums = a6b2fd7a688ef5a23539c1256380a6389e6fa474312ad9dee5cc77bcfabe92910a8913ffcf599c940a93bb3a5c89e01f3bedad4176f4d57dd33a68e0499c30bd + b2sums = d5a6845cb1ddb07f0cac20215c15d059f0c18aa43a7b549e7e738e58b8686b4db26b71426aafc8e682d6fd6f676fc0f468f53ea61968c4184feaaa22a23f5bc5 pkgname = telegraf diff --git a/.gitignore b/.gitignore index 8e1aac5bdb95..c9d85b65ffab 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ !.SRCINFO !telegraf.install !telegraf.service -!telegraf.sysusers -!telegraf.tmpfiles @@ -16,14 +16,10 @@ backup=('etc/telegraf/telegraf.conf') install="${pkgname}.install" source=("https://github.com/influxdata/${pkgname}/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz" "${pkgname}.install" - "${pkgname}.service" - "${pkgname}.sysusers" - "${pkgname}.tmpfiles") + "${pkgname}.service") b2sums=('3a8d21309e66f6129824ae82f3acae97a69312281152d9778b11fef8c88910d6ddb4c93a8ea4d2e575e3b2431879dd25ade01a3c01efdf428f8e331871d8bb1b' - 'a99e279fa6057b64b8a531922b9ce249fccea86b777686966932b6101923aaa9bacfe51d14dd2ef3168217b0d2d76fd06ce8ff50ae27d19fee69fcad975a83a9' - 'a0ea1bf213d10a6186993a48e6a8ca0ab70e3a949d85d0f7b881baeea3d051d05596863f1cef28ad83b0d2bc976a101014d7c04ae17a3ce2b98ce73b2b205826' - 'aac77720058d91abbe0ad28dadeb429a812e94c970c29491d787f039aece4a6401e8d52aa8c31b439771e8c31aed97cd822f1d4730eaa86fdff7140a0f45e143' - '16df3d7a60cf88f979c48983e0bba099cc6c270f173b5caf9716c51b5545cf4d6494141d8e068e8ab39dacb6f3e6ca54c30aea619854ac752d804244b5a1cc21') + 'a6b2fd7a688ef5a23539c1256380a6389e6fa474312ad9dee5cc77bcfabe92910a8913ffcf599c940a93bb3a5c89e01f3bedad4176f4d57dd33a68e0499c30bd' + 'd5a6845cb1ddb07f0cac20215c15d059f0c18aa43a7b549e7e738e58b8686b4db26b71426aafc8e682d6fd6f676fc0f468f53ea61968c4184feaaa22a23f5bc5') prepare() { cd "${pkgname}-${pkgver}" @@ -57,10 +53,4 @@ package() { # service install -D -m644 "${srcdir}/${pkgname}.service" \ "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" - - # systemd user and home directory - install -D -m644 "${srcdir}/${pkgname}.sysusers" \ - "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" - install -D -m644 "${srcdir}/${pkgname}.tmpfiles" \ - "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" } diff --git a/telegraf.install b/telegraf.install index 893c28368f5c..d6a3bb329258 100644 --- a/telegraf.install +++ b/telegraf.install @@ -1,5 +1,4 @@ post_remove() { - echo "Remember that the following directories aren't removed." + echo "Remember that the following directory isn't removed." echo " -> /etc/telegraf" - echo " -> /var/lib/telegraf" } diff --git a/telegraf.service b/telegraf.service index 4f874c021462..fdf6c40449bf 100644 --- a/telegraf.service +++ b/telegraf.service @@ -3,12 +3,17 @@ Description=Plugin-driven server agent for reporting metrics into InfluxDB After=network.target [Service] +Type=notify User=telegraf Group=telegraf +DynamicUser=yes ExecStart=/usr/bin/telegraf -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d ExecReload=/bin/kill -HUP $MAINPID -KillMode=control-group Restart=on-failure +RestartForceExitStatus=SIGPIPE +KillMode=mixed +TimeoutStopSec=5 +LimitMEMLOCK=8M:8M [Install] WantedBy=multi-user.target diff --git a/telegraf.sysusers b/telegraf.sysusers deleted file mode 100644 index 73daa378c03c..000000000000 --- a/telegraf.sysusers +++ /dev/null @@ -1 +0,0 @@ -u telegraf - - /var/lib/telegraf diff --git a/telegraf.tmpfiles b/telegraf.tmpfiles deleted file mode 100644 index 39fc35256abd..000000000000 --- a/telegraf.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/lib/telegraf 0755 telegraf telegraf |