From 32fca3f276a266548a61858bc39ca9bebcc951cc Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 6 Jun 2022 21:17:10 +0200 Subject: ma: migrate services back to gum --- krebs/3modules/makefu/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs/3modules/makefu') diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index d63277132..b0bd83248 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -129,6 +129,7 @@ in { aliases = [ "omo.r" "dcpp.omo.r" + "backup.makefu.r" "torrent.omo.r" ]; }; @@ -153,9 +154,6 @@ in { extraZones = { "krebsco.de" = '' latte.euer IN A ${nets.internet.ip4.addr} - rss.euer IN A ${nets.internet.ip4.addr} - o.euer IN A ${nets.internet.ip4.addr} - bw.euer IN A ${nets.internet.ip4.addr} ''; }; cores = 4; @@ -194,6 +192,9 @@ in { ci = true; extraZones = { "krebsco.de" = '' + rss.euer IN A ${nets.internet.ip4.addr} + o.euer IN A ${nets.internet.ip4.addr} + bw.euer IN A ${nets.internet.ip4.addr} bookmark.euer IN A ${nets.internet.ip4.addr} boot IN A ${nets.internet.ip4.addr} boot.euer IN A ${nets.internet.ip4.addr} @@ -263,7 +264,6 @@ in { aliases = [ "gum.r" - "backup.makefu.r" "blog.gum.r" "blog.makefu.r" "cache.gum.r" -- cgit v1.2.3 From ffdb73bed516bda154bb1c460a5e91eaaa6093da Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 6 Jun 2022 21:34:02 +0200 Subject: ma retiolum: temporarily add helper script for retioum --- krebs/3modules/makefu/retiolum/doit.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 krebs/3modules/makefu/retiolum/doit.sh (limited to 'krebs/3modules/makefu') diff --git a/krebs/3modules/makefu/retiolum/doit.sh b/krebs/3modules/makefu/retiolum/doit.sh new file mode 100755 index 000000000..1a2657599 --- /dev/null +++ b/krebs/3modules/makefu/retiolum/doit.sh @@ -0,0 +1,19 @@ +#!/bin/sh + + +for i in *.pub;do + sleep 1 + host=${i%%.pub} + if test -e "${host}_ed25519.pub" ;then + echo "ed25519 key already exits" + else + tmpdir=$(mktemp --tmpdir -d create-retiolum-ed25519-keys.XXXXXXXX) + trap 'rm -vR "$tmpdir"' EXIT + tinc --batch --config "$tmpdir" generate-ed25519-keys + + cp -v "$tmpdir/ed25519_key.pub" "${host}_ed25519.pub" + cat "$tmpdir/ed25519_key.priv" | secrets insert -m "$host/retiolum.ed25519_key.priv" + rm -vR "$tmpdir" + fi + +done -- cgit v1.2.3 From cb31764b6d121605d482244f4e17bc3c36e50634 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 6 Jun 2022 21:35:21 +0200 Subject: ma retioum: remove wrapper script --- krebs/3modules/makefu/retiolum/doit.sh | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100755 krebs/3modules/makefu/retiolum/doit.sh (limited to 'krebs/3modules/makefu') diff --git a/krebs/3modules/makefu/retiolum/doit.sh b/krebs/3modules/makefu/retiolum/doit.sh deleted file mode 100755 index 1a2657599..000000000 --- a/krebs/3modules/makefu/retiolum/doit.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - - -for i in *.pub;do - sleep 1 - host=${i%%.pub} - if test -e "${host}_ed25519.pub" ;then - echo "ed25519 key already exits" - else - tmpdir=$(mktemp --tmpdir -d create-retiolum-ed25519-keys.XXXXXXXX) - trap 'rm -vR "$tmpdir"' EXIT - tinc --batch --config "$tmpdir" generate-ed25519-keys - - cp -v "$tmpdir/ed25519_key.pub" "${host}_ed25519.pub" - cat "$tmpdir/ed25519_key.priv" | secrets insert -m "$host/retiolum.ed25519_key.priv" - rm -vR "$tmpdir" - fi - -done -- cgit v1.2.3