From 2f3d7cfea1e087f7d80d74febd68012eae611f2e Mon Sep 17 00:00:00 2001
From: Markus Pesch <markus.pesch@cryptic.systems>
Date: Tue, 13 Jun 2023 19:18:32 +0200
Subject: [PATCH] fix: sysusers and extra args

---
 .SRCINFO                             | 13 +++++--------
 PKGBUILD                             | 14 +++++---------
 prometheus-x509-certificate-exporter |  7 +------
 systemd.service                      |  2 +-
 sysusers.conf                        |  1 -
 5 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 sysusers.conf

diff --git a/.SRCINFO b/.SRCINFO
index 2ffdbf6..5f34c37 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = prometheus-x509-certificate-exporter
 	pkgdesc = metric exporter for x509 certificates
 	pkgver = 3.6.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/enix/x509-certificate-exporter
 	arch = armv7h
 	arch = aarch64
@@ -11,14 +11,11 @@ pkgbase = prometheus-x509-certificate-exporter
 	source = https://github.com/enix/x509-certificate-exporter/archive/refs/tags/v3.6.0.zip
 	source = prometheus-x509-certificate-exporter
 	source = systemd.service
-	source = sysusers.conf
 	sha512sums = 7d8d4e091d37f3cd0bdff42ed62797d8a2d5749ad8b0d01acbb8edc15571d79daf7d08c0d4a7aeb85416fdbd396d98a89b6ddc0bc0fb92f394e6ef21e35eb06b
-	sha512sums = 681a744d7a7d7825d857b5d14ea19fefe0302de2d98fa76a2442335ecc7cf4cf2dfd03aa8fe9b3356544ef29b0823279a3810c78eabbf8be6c88a0a71f509967
-	sha512sums = 5fb623fd40983b1ae9de5a2fe05fe70ece36c8ce6ca80f58dbfdaa160afbaba99efd125f5a6b90e6f0e2d4f3545f1d68a66c67feaac58972bd8d1572cc5c08c7
-	sha512sums = 02585897ce834c1f23aa0d0eda61e60d003ae3bf16ff9ec819d029602d5d78c260f8ba3b9e9a6e28c1ebe84e6d7e9aaf3c757db5d8656b9f0bdd9caab6d9f36d
+	sha512sums = 2fd59748f9cb4018456befcc07bb1e4a68cbe5d5bf30faa74e4bc607c241623ee66d6ea7765a5bcd707dfa2a1eb674b7e2e766e27fc0c462c0db1b5ec6aa13ac
+	sha512sums = f0e6848cb2ae0e103754cca3eb6fd0e259b5e26b219275abb0041b6458f55425ea794da2f25b9e5bf2a24ca953864379d6d174e26c86c3a9da4c11785a9f6ec7
 	b2sums = fbc8ed61f07fa7c44138ce303f5f73d4ff32e6a71e47e7cae0b7f7d97e9fd02635fd80d59a1d67b5a5de2eefa83693431797c6b519b60cccf87bceb83f7ab751
-	b2sums = 3d6adfad59d88ff99b1e4f924651746e62e562fefa0360f02fe1091e920b0bb74e4f54930ff1f863b9004a490e90c78dc92d16ca234b5b536315b7fd45cbf4e4
-	b2sums = d94c2a9a9a895be60e3d4d0db08ceb163b27fe12c96c7f1d51497627a4ce4e9d03a0fa434b2aacb232e3dc279d7158238b43ea48c85fe4d82cffd00992c89c66
-	b2sums = 6e4ed3697654dbc6cdef10f92dfe324459158769f2287ffd167172f9a5f2fbb3ebaa2e79c5da8ff88950ab9ad0f301d5c348c5d8e872d2efc56530ee1547918e
+	b2sums = 41d9f7daeeedddc11056ac3b8e741afbab80c5779ce3823aa2d88f179e779c0715ccf8c471d645ef74df87f0f7c33cbec92a0ecdae148bd80f83670b6446038c
+	b2sums = 6a8ed26fcd1390e91801cd1978e28b1aee88327784f8c07d02b95193e66ea62e2be009cb1047b8afafbc5183e99a90b43cb0c2239e61091872dae0ce6bef041a
 
 pkgname = prometheus-x509-certificate-exporter
diff --git a/PKGBUILD b/PKGBUILD
index 61289bf..e68f1fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=prometheus-x509-certificate-exporter
 _pkgname=x509-certificate-exporter
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="metric exporter for x509 certificates"
 arch=('armv7h' 'aarch64' 'x86_64')
 url="https://github.com/enix/$_pkgname"
@@ -13,16 +13,13 @@ source=(
   "$url/archive/refs/tags/v$pkgver.zip"
   'prometheus-x509-certificate-exporter'
   'systemd.service'
-  'sysusers.conf'
 )
 sha512sums=('7d8d4e091d37f3cd0bdff42ed62797d8a2d5749ad8b0d01acbb8edc15571d79daf7d08c0d4a7aeb85416fdbd396d98a89b6ddc0bc0fb92f394e6ef21e35eb06b'
-            '681a744d7a7d7825d857b5d14ea19fefe0302de2d98fa76a2442335ecc7cf4cf2dfd03aa8fe9b3356544ef29b0823279a3810c78eabbf8be6c88a0a71f509967'
-            '5fb623fd40983b1ae9de5a2fe05fe70ece36c8ce6ca80f58dbfdaa160afbaba99efd125f5a6b90e6f0e2d4f3545f1d68a66c67feaac58972bd8d1572cc5c08c7'
-            '02585897ce834c1f23aa0d0eda61e60d003ae3bf16ff9ec819d029602d5d78c260f8ba3b9e9a6e28c1ebe84e6d7e9aaf3c757db5d8656b9f0bdd9caab6d9f36d')
+            '2fd59748f9cb4018456befcc07bb1e4a68cbe5d5bf30faa74e4bc607c241623ee66d6ea7765a5bcd707dfa2a1eb674b7e2e766e27fc0c462c0db1b5ec6aa13ac'
+            'f0e6848cb2ae0e103754cca3eb6fd0e259b5e26b219275abb0041b6458f55425ea794da2f25b9e5bf2a24ca953864379d6d174e26c86c3a9da4c11785a9f6ec7')
 b2sums=('fbc8ed61f07fa7c44138ce303f5f73d4ff32e6a71e47e7cae0b7f7d97e9fd02635fd80d59a1d67b5a5de2eefa83693431797c6b519b60cccf87bceb83f7ab751'
-        '3d6adfad59d88ff99b1e4f924651746e62e562fefa0360f02fe1091e920b0bb74e4f54930ff1f863b9004a490e90c78dc92d16ca234b5b536315b7fd45cbf4e4'
-        'd94c2a9a9a895be60e3d4d0db08ceb163b27fe12c96c7f1d51497627a4ce4e9d03a0fa434b2aacb232e3dc279d7158238b43ea48c85fe4d82cffd00992c89c66'
-        '6e4ed3697654dbc6cdef10f92dfe324459158769f2287ffd167172f9a5f2fbb3ebaa2e79c5da8ff88950ab9ad0f301d5c348c5d8e872d2efc56530ee1547918e')
+        '41d9f7daeeedddc11056ac3b8e741afbab80c5779ce3823aa2d88f179e779c0715ccf8c471d645ef74df87f0f7c33cbec92a0ecdae148bd80f83670b6446038c'
+        '6a8ed26fcd1390e91801cd1978e28b1aee88327784f8c07d02b95193e66ea62e2be009cb1047b8afafbc5183e99a90b43cb0c2239e61091872dae0ce6bef041a')
 
 build() {
   cd "$_pkgname-$pkgver/cmd/$_pkgname"
@@ -35,7 +32,6 @@ build() {
 package() {
   # systemd integration
   install -D --mode 0644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -D --mode 0644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 
   # binary
   install -D --mode 0755 --target-directory "$pkgdir/usr/bin" "$_pkgname-$pkgver/cmd/$_pkgname/$pkgname"
diff --git a/prometheus-x509-certificate-exporter b/prometheus-x509-certificate-exporter
index f8e0bc2..a932237 100644
--- a/prometheus-x509-certificate-exporter
+++ b/prometheus-x509-certificate-exporter
@@ -1,6 +1 @@
-# F2B_COLLECTOR_SOCKET=""
-# F2B_COLLECTOR_TEXT_PATH=""
-# F2B_WEB_LISTEN_ADDRESS=""
-# F2B_WEB_BASICAUTH_USER=""
-# F2B_WEB_BASICAUTH_PASS=""
-# F2B_EXIT_ON_SOCKET_CONN_ERROR=""
\ No newline at end of file
+EXTRA_ARGS=""
\ No newline at end of file
diff --git a/systemd.service b/systemd.service
index 6659bbc..96c28ab 100644
--- a/systemd.service
+++ b/systemd.service
@@ -5,7 +5,7 @@ After=network-online.target
 
 [Service]
 EnvironmentFile=/etc/conf.d/prometheus-x509-certificate-exporter
-ExecStart=/usr/bin/prometheus-x509-certificate-exporter
+ExecStart=/usr/bin/prometheus-x509-certificate-exporter ${EXTRA_ARGS}
 ExecReload=/bin/kill -HUP $MAINPID
 User=root
 Group=root
diff --git a/sysusers.conf b/sysusers.conf
deleted file mode 100644
index 800ae95..0000000
--- a/sysusers.conf
+++ /dev/null
@@ -1 +0,0 @@
-u prometheus-x509-certificate-exporter - "Prometheus x509 certificate exporter user"