From 743fac00f693e1bddd1c4766983183f78409d8b5 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 13 Jan 2020 16:38:47 -0500 Subject: [PATCH] sachet: update apkbuild, confd, initd --- sr.ht/sachet/APKBUILD | 17 ++++++++--------- sr.ht/sachet/sachet.confd | 8 ++++---- sr.ht/sachet/sachet.initd | 7 +++---- sr.ht/sachet/{config.yml => sachet.yml} | 0 4 files changed, 15 insertions(+), 17 deletions(-) rename sr.ht/sachet/{config.yml => sachet.yml} (100%) diff --git a/sr.ht/sachet/APKBUILD b/sr.ht/sachet/APKBUILD index 0908d0e..93bc209 100644 --- a/sr.ht/sachet/APKBUILD +++ b/sr.ht/sachet/APKBUILD @@ -12,7 +12,7 @@ source=" $pkgname-$pkgver.tar.gz::https://github.com/messagebird/sachet/archive/$pkgver.tar.gz sachet.confd sachet.initd - config.yml + sachet.yml " subpackages="$pkgname-openrc" @@ -21,7 +21,6 @@ build() { -trimpath \ -mod=vendor \ -ldflags "-extldflags $LDFLAGS" \ - -tags netgo \ ./cmd/sachet } @@ -37,14 +36,14 @@ package() { install -Dm644 "$srcdir"/sachet.confd \ "$pkgdir"/etc/conf.d/sachet - mkdir -p "$pkgdir"/etc/sachet - install -Dm644 "$srcdir"/config.yml \ - "$pkgdir"/etc/sachet/config.yml + mkdir -p "$pkgdir"/etc/alertmanager/templates + install -Dm644 "$srcdir"/sachet.yml \ + "$pkgdir"/etc/alertmanager/sachet.yml install -Dm644 examples/telegram.tmpl \ - "$pkgdir"/etc/sachet/telegram.tmpl + "$pkgdir"/etc/alertmanager/templates/telegram.tmpl } sha512sums="3684090505403cff65cd05e2c6b61cf930dd0d7e461c355963417197bdd6306b837dbc5933b34676646cc9ae480190313c1aebfa81699581d0aafff377127e92 sachet-0.2.2.tar.gz -9516a5a26ecfff4b6511084df346ee66fd923522d2750ce5deb894980c7782f5175ebd83a5a401a384f6caa28c1aa436de56660538f417fa6c71d9e4397b6bf4 sachet.confd -68fc6733011d854d5dabbc6e646774b5c9cc78fce2a79b14ab8d4eb760fad86aac62149847ed9749198e9a46cc65e8bc5a4894c8dafe3c750e4a9fe7c81b066d sachet.initd -579dd96a930ea02d33e5d084421f873d72b125f4314d7bd7170fe6705adce742abaa626297191779e7edb25a50c03e87b25fd4250f4c08cc175e0674724f2b1e config.yml" +efe429b994b3c139a3804055ea20fe4a8deaf17f58385b800487b4b8d363d1de817bcac751ae5c4cf16b228f896ff17eab19c5d49c7309174d8f0a07386fb772 sachet.confd +da4dc3fde83bd6e545d1eabe9cc06f25b2de8f574a5dbf3a4e1dfbf57036849ec4359bc6d254a3a35f6e970e5b36af7fc780767b68bff96bf92a821b1029fa95 sachet.initd +579dd96a930ea02d33e5d084421f873d72b125f4314d7bd7170fe6705adce742abaa626297191779e7edb25a50c03e87b25fd4250f4c08cc175e0674724f2b1e sachet.yml" diff --git a/sr.ht/sachet/sachet.confd b/sr.ht/sachet/sachet.confd index 5c21c6a..fead7f5 100644 --- a/sr.ht/sachet/sachet.confd +++ b/sr.ht/sachet/sachet.confd @@ -1,5 +1,5 @@ -alertmanager_config_file=/etc/alertmanager/alertmanager.yml -alertmanager_storage_path=/var/lib/alertmanager/data +sachet_config_file=/etc/alertmanager/sachet.yml +sachet_listen_address=:9876 -output_log=/var/log/alertmanager.log -error_log=/var/log/alertmanager.log +output_log=/var/log/sachet.log +error_log=/var/log/sachet.log diff --git a/sr.ht/sachet/sachet.initd b/sr.ht/sachet/sachet.initd index 59daca7..2ada94f 100644 --- a/sr.ht/sachet/sachet.initd +++ b/sr.ht/sachet/sachet.initd @@ -1,10 +1,9 @@ #!/sbin/openrc-run -name="alertmanager" -description="alert manager for the prometheus monitoring system" +name="sachet" +description="SMS alerts for Prometheus' Alertmanager" supervisor=supervise-daemon command=/usr/bin/prometheus -command_args="--config.file=$alertmanager_config_file \ - --storage.path=$alertmanager_storage_path" +command_args="-config $sachet_config_file -listen-address $sachet_listen_address" command_user="prometheus:prometheus" pidfile="/run/${RC_SVCNAME}.pid" diff --git a/sr.ht/sachet/config.yml b/sr.ht/sachet/sachet.yml similarity index 100% rename from sr.ht/sachet/config.yml rename to sr.ht/sachet/sachet.yml -- 2.45.2