From 96e934dc8a353cff91ef824f6a125ed49996d058 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 12 Dec 2022 19:43:38 +0100 Subject: k 3 wiregrill: add telex --- krebs/3modules/makefu/default.nix | 6 ++++++ krebs/3modules/makefu/wiregrill/telex.pub | 1 + 2 files changed, 7 insertions(+) create mode 100644 krebs/3modules/makefu/wiregrill/telex.pub (limited to 'krebs') diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 0d5359989..c1aeffe4a 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -151,6 +151,12 @@ in { }; }; }; + # pixel3a + telex.nets.wiregrill = { + aliases = ["telex.w"]; + ip6.addr = (krebs.genipv6 "wiregrill" "makefu" { hostName = "telex"; }).address; + }; + latte = rec { ci = true; extraZones = { diff --git a/krebs/3modules/makefu/wiregrill/telex.pub b/krebs/3modules/makefu/wiregrill/telex.pub new file mode 100644 index 000000000..12a42177e --- /dev/null +++ b/krebs/3modules/makefu/wiregrill/telex.pub @@ -0,0 +1 @@ +T7Cr80dBbtPFCPdz4OS7whDlQJzn2Orclq5rLVtD+Ds= -- cgit v1.2.3 From 26f67c6c803d70e0c947790d5f8cf60db8199910 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 12 Dec 2022 20:55:37 +0100 Subject: k puyak.r: rip alertmanager-telegram --- krebs/1systems/puyak/config.nix | 1 + .../2configs/shack/prometheus/alertmanager-telegram.nix | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 krebs/2configs/shack/prometheus/alertmanager-telegram.nix (limited to 'krebs') diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index f4bd472a4..de98a84cd 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -110,6 +110,7 @@ # + # TODO: alertmanager 0.24+ supports telegram ]; diff --git a/krebs/2configs/shack/prometheus/alertmanager-telegram.nix b/krebs/2configs/shack/prometheus/alertmanager-telegram.nix deleted file mode 100644 index 8527001cb..000000000 --- a/krebs/2configs/shack/prometheus/alertmanager-telegram.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ...}: -{ - systemd.services.alertmanager-bot-telegram = { - wantedBy = [ "multi-user.target" ]; - after = [ "ip-up.target" ]; - serviceConfig = { - EnvironmentFile = toString ; - DynamicUser = true; - StateDirectory = "alertbot"; - ExecStart = ''${pkgs.alertmanager-bot-telegram}/bin/alertmanager-bot \ - --alertmanager.url=http://alert.prometheus.shack --log.level=info \ - --store=bolt --bolt.path=/var/lib/alertbot/bot.db \ - --listen.addr="0.0.0.0:16320" \ - --template.paths=${./templates}/shack.tmpl''; - }; - }; -} -- cgit v1.2.3 From 908bb16cc8356a1b77fc79a9f49c0bd0a3d8b3e0 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 12 Dec 2022 20:59:24 +0100 Subject: ma gui/look-up: fix configuration --- krebs/1systems/puyak/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index de98a84cd..033cb94d1 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -111,7 +111,7 @@ # # TODO: alertmanager 0.24+ supports telegram - + # ]; krebs.build.host = config.krebs.hosts.puyak; -- cgit v1.2.3 From d4281b3dbeb8452844ccb679839ad601b20fe64a Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 12 Dec 2022 23:43:16 +0100 Subject: k pkgs.passwdqc: 1.3.0 -> 2.0.2 --- krebs/5pkgs/simple/passwdqc-utils/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/passwdqc-utils/default.nix b/krebs/5pkgs/simple/passwdqc-utils/default.nix index c6f866e56..1def3167c 100644 --- a/krebs/5pkgs/simple/passwdqc-utils/default.nix +++ b/krebs/5pkgs/simple/passwdqc-utils/default.nix @@ -1,17 +1,17 @@ { fetchurl, lib, stdenv , libxcrypt -, pam +, linux-pam , wordset-file ? null, # set your own wordset-file }: stdenv.mkDerivation rec { - name = "passwdqc-utils-${version}"; - version = "1.3.0"; - buildInputs = [ libxcrypt pam ]; + pname = "passwdqc-utils"; + version = "2.0.2"; + buildInputs = [ libxcrypt linux-pam ]; src = fetchurl { url = "http://www.openwall.com/passwdqc/passwdqc-${version}.tar.gz"; - sha256 = "0l3zbrp4pvah0dz33m48aqlz9nx663cc1fqhnlwr0p853b10la93"; + hash = "sha256-/x9QV2TAIPakSEseDMT9vy4/cbUikm2QtHCRBMoGBKs="; }; buildTargets = "utils"; -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/e0100000.lock: No such file or directory (2)