diff options
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/3modules/default.nix | 25 | ||||
| -rw-r--r-- | krebs/3modules/lass/default.nix | 9 | ||||
| -rw-r--r-- | krebs/3modules/tv/default.nix | 4 | ||||
| -rw-r--r-- | krebs/5pkgs/Reaktor/scripts/sed-plugin.py | 18 |
4 files changed, 39 insertions, 17 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index d539d4166..daa963bc8 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -105,9 +105,7 @@ let gg23 = "hosts"; shack = "hosts"; i = "hosts"; - internet = "hosts"; r = "hosts"; - retiolum = "hosts"; }; krebs.users = { @@ -141,6 +139,29 @@ let ) cfg.hosts )); + # TODO dedup with networking.extraHosts + nixpkgs.config.packageOverrides = oldpkgs: + let + domains = attrNames (filterAttrs (_: eq "hosts") cfg.dns.providers); + check = hostname: any (domain: hasSuffix ".${domain}" hostname) domains; + in + { + retiolum-hosts = oldpkgs.writeText "retiolum-hosts" '' + ${concatStringsSep "\n" (flatten ( + map (host: + let + net = host.nets.retiolum; + aliases = longs; + longs = filter check net.aliases; + in + optionals + (aliases != []) + (map (addr: "${addr} ${toString aliases}") net.addrs) + ) (filter (host: hasAttr "retiolum" host.nets) + (attrValues cfg.hosts))))} + ''; + }; + # Implements environment.etc."zones/<zone-name>" environment.etc = let stripEmptyLines = s: (concatStringsSep "\n" diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index cd8238dc1..b86e05319 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -10,7 +10,7 @@ with import <stockholm/lib>; internet = { ip4.addr = "144.76.172.188"; aliases = [ - "dishfire.internet" + "dishfire.i" ]; ssh.port = 45621; }; @@ -42,7 +42,7 @@ with import <stockholm/lib>; internet = { ip4.addr = "104.233.79.118"; aliases = [ - "echelon.internet" + "echelon.i" ]; ssh.port = 45621; }; @@ -82,9 +82,8 @@ with import <stockholm/lib>; internet = { ip4.addr = "213.239.205.240"; aliases = [ - "prism.internet" + "prism.i" "paste.i" - "paste.internet" ]; ssh.port = 45621; }; @@ -132,7 +131,7 @@ with import <stockholm/lib>; internet = { ip4.addr = "104.167.113.104"; aliases = [ - "cloudkrebs.internet" + "cloudkrebs.i" ]; ssh.port = 45621; }; diff --git a/krebs/3modules/tv/default.nix b/krebs/3modules/tv/default.nix index e387fabc5..0db686005 100644 --- a/krebs/3modules/tv/default.nix +++ b/krebs/3modules/tv/default.nix @@ -413,8 +413,8 @@ with import <stockholm/lib>; dv = { mail = "dv@alnus.r"; }; - mv-cd = { - mail = "mv@cd.r"; + mv-ni = { + mail = "mv@ni.r"; pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGer9e2+Lew7vnisgBbsFNECEIkpNJgEaqQqgb9inWkQ mv@vod"; }; tv = { diff --git a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py b/krebs/5pkgs/Reaktor/scripts/sed-plugin.py index 22b48e59d..da8e2f726 100644 --- a/krebs/5pkgs/Reaktor/scripts/sed-plugin.py +++ b/krebs/5pkgs/Reaktor/scripts/sed-plugin.py @@ -3,15 +3,17 @@ # Usage: # _from=krebs state_dir=. python sed-plugin.py 'dick butt' # _from=krebs state_dir=. python sed-plugin.py 's/t/l/g' -## dick bull +# > dick bull import shelve from os import environ from os.path import join from sys import argv -d = shelve.open(join(environ['state_dir'],'sed-plugin.shelve'),writeback=True) -usr = environ['_from'] import re +d = shelve.open(join(environ['state_dir'], 'sed-plugin.shelve'), writeback=True) +usr = environ['_from'] + + def is_regex(line): myre = re.compile(r'^s/(?:\\/|[^/])+/(?:\\/|[^/])*/[ig]?$') return myre.match(line) @@ -19,15 +21,15 @@ def is_regex(line): line = argv[1] if is_regex(line): - last = d.get(usr,None) + last = d.get(usr, None) if last: - from subprocess import Popen,PIPE - p = Popen(['sed',line],stdin=PIPE,stdout=PIPE) - so,se = p.communicate(bytes("{}\n".format(last),"UTF-8")) + from subprocess import Popen, PIPE + p = Popen(['sed', line], stdin=PIPE, stdout=PIPE) + so, se = p.communicate(bytes("{}\n".format(last), "UTF-8")) if p.returncode: print("something went wrong when trying to process your regex: {}".format(se.decode())) ret = so.decode() - print("\x1b[1m{}\x1b[0m meinte: {}".format(usr,ret.strip())) + print("\x1b[1m{}\x1b[0m meant: {}".format(usr, ret.strip())) if ret: d[usr] = ret |