From 2932d9ff69b885e09827c4d7af4f91eabc8744bc Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Fri, 9 Jun 2023 22:16:43 +0200 Subject: [PATCH] fix: rename prometheus binary and systemd service --- .SRCINFO | 6 +++--- PKGBUILD | 14 +++++++------- systemd.service | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 54f23cd..f0d9a97 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = prometheus-fail2ban-exporter pkgdesc = Fail2Ban exporter for Fail2Ban metrics pkgver = 0.7.2 - pkgrel = 1 + pkgrel = 2 url = https://gitlab.com/hectorjsmith/fail2ban-prometheus-exporter arch = x86_64 license = MIT @@ -11,10 +11,10 @@ pkgbase = prometheus-fail2ban-exporter source = systemd.service source = sysusers.conf sha512sums = b7691cc31c747965b8ac9e8f818d4411b716888be5c84c51bbe5e206022bf9b60f95abddc37c8011a412a40ba0665107e957a55b3acba5018fd5be85c442380e - sha512sums = 35747b143d7aed606ce25673061603d6c5b1623fb86c180aaa0a23f6afde26f4d2cde99d05cc1cc7fd7d8ccacbb6d3413cfcfcc3f26f7530d1f0d9151877b4d1 + sha512sums = 19a61f7a7be1c73cbe87a978f5787ae35304e2e6db03a927016e1a5a8b0715bc3d971e52da61ce5f1a7fd302ae7646a4c54c7fdc082ee9c371368d56be311d09 sha512sums = c070f57c58f367421835fe757b6b46e4c6cc3a69e0e927b10c229daab945fc52e57acdf25a84f04f752cb7304c40c2ff95e7987daf41c80f8857d409def1752f b2sums = 87ab07b334594ecb792d817abb9bca1c7565be64df79d6dfa5edd268241534345a9e7e5b782dfcfd623d6a63db77b8803c614e44c3d44f9b7ca6b41952c6eb20 - b2sums = a4ff2f3da50e353f8cfdca96de54a5fa83a2bcd12cf7a7c873b4cf4a55e745e35593b0d13a77edd6ade51ce582c6001d2241bd20491269538880e2b9e0816181 + b2sums = 126dae6e1a1fe9bcc67e2dafc203aeb5f057aea82fec65b4f8c18f5a4bc3154f9e22e53b043f9c6f849f625d4ecf77ea67be5bb562b0b794814ad695f48bd235 b2sums = 4b731a290e1ad967f9e7708b00d4b9279bdbc57461c62d09a8bff00958e72cb8e69848d73af486bcc9e58ffe1e087ca86dc2625770a25ebd47e41d7bba193bef pkgname = prometheus-fail2ban-exporter diff --git a/PKGBUILD b/PKGBUILD index 3ac4969..65a9332 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=prometheus-fail2ban-exporter _pkgname=fail2ban-prometheus-exporter pkgver=0.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="Fail2Ban exporter for Fail2Ban metrics" arch=('x86_64') url="https://gitlab.com/hectorjsmith/$_pkgname" @@ -16,10 +16,10 @@ source=( 'sysusers.conf' ) sha512sums=('b7691cc31c747965b8ac9e8f818d4411b716888be5c84c51bbe5e206022bf9b60f95abddc37c8011a412a40ba0665107e957a55b3acba5018fd5be85c442380e' - '35747b143d7aed606ce25673061603d6c5b1623fb86c180aaa0a23f6afde26f4d2cde99d05cc1cc7fd7d8ccacbb6d3413cfcfcc3f26f7530d1f0d9151877b4d1' + '19a61f7a7be1c73cbe87a978f5787ae35304e2e6db03a927016e1a5a8b0715bc3d971e52da61ce5f1a7fd302ae7646a4c54c7fdc082ee9c371368d56be311d09' 'c070f57c58f367421835fe757b6b46e4c6cc3a69e0e927b10c229daab945fc52e57acdf25a84f04f752cb7304c40c2ff95e7987daf41c80f8857d409def1752f') b2sums=('87ab07b334594ecb792d817abb9bca1c7565be64df79d6dfa5edd268241534345a9e7e5b782dfcfd623d6a63db77b8803c614e44c3d44f9b7ca6b41952c6eb20' - 'a4ff2f3da50e353f8cfdca96de54a5fa83a2bcd12cf7a7c873b4cf4a55e745e35593b0d13a77edd6ade51ce582c6001d2241bd20491269538880e2b9e0816181' + '126dae6e1a1fe9bcc67e2dafc203aeb5f057aea82fec65b4f8c18f5a4bc3154f9e22e53b043f9c6f849f625d4ecf77ea67be5bb562b0b794814ad695f48bd235' '4b731a290e1ad967f9e7708b00d4b9279bdbc57461c62d09a8bff00958e72cb8e69848d73af486bcc9e58ffe1e087ca86dc2625770a25ebd47e41d7bba193bef') build() { @@ -27,15 +27,15 @@ build() { go build -v \ -buildmode=pie \ -trimpath \ - -o fail2ban-exporter . + -o $pkgname . } package() { # systemd integration - install -Dm644 systemd.service "$pkgdir/usr/lib/systemd/system/fail2ban-exporter.service" - install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/fail2ban-exporter.conf" + install -Dm644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service" + install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" # binary - install -D --mode 0755 --target-directory "$pkgdir/usr/bin" "$_pkgname-$pkgver/src/fail2ban-exporter" + install -D --mode 0755 --target-directory "$pkgdir/usr/bin" "$_pkgname-$pkgver/src/$pkgname" install -D --mode 0755 --target-directory "$pkgdir/usr/share/licenses/$pkgname" "$_pkgname-$pkgver/LICENSE" } diff --git a/systemd.service b/systemd.service index a673381..b5ea6ef 100644 --- a/systemd.service +++ b/systemd.service @@ -4,7 +4,7 @@ Requires=network-online.target After=network-online.target [Service] -ExecStart=/usr/bin/fail2ban-exporter +ExecStart=/usr/bin/prometheus-fail2ban-exporter ExecReload=/bin/kill -HUP $MAINPID User=root Group=root