summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--krebs/3modules/default.nix10
-rw-r--r--krebs/3modules/retiolum.nix2
-rw-r--r--krebs/Zhosts/Styx (renamed from Zhosts/Styx)0
-rw-r--r--krebs/Zhosts/ThinkArmageddon (renamed from Zhosts/ThinkArmageddon)0
-rw-r--r--krebs/Zhosts/TriBot (renamed from Zhosts/TriBot)0
-rw-r--r--krebs/Zhosts/ach (renamed from Zhosts/ach)0
-rw-r--r--krebs/Zhosts/air (renamed from Zhosts/air)0
-rw-r--r--krebs/Zhosts/alarmpi (renamed from Zhosts/alarmpi)0
-rw-r--r--krebs/Zhosts/albi10 (renamed from Zhosts/albi10)0
-rw-r--r--krebs/Zhosts/albi7 (renamed from Zhosts/albi7)0
-rw-r--r--krebs/Zhosts/almoehi (renamed from Zhosts/almoehi)0
-rw-r--r--krebs/Zhosts/alphalabs (renamed from Zhosts/alphalabs)0
-rw-r--r--krebs/Zhosts/apfull (renamed from Zhosts/apfull)0
-rw-r--r--krebs/Zhosts/bitchctl (renamed from Zhosts/bitchctl)0
-rw-r--r--krebs/Zhosts/bitchextend (renamed from Zhosts/bitchextend)0
-rw-r--r--krebs/Zhosts/bitchtop (renamed from Zhosts/bitchtop)0
-rw-r--r--krebs/Zhosts/box (renamed from Zhosts/box)0
-rw-r--r--krebs/Zhosts/bridge (renamed from Zhosts/bridge)0
-rw-r--r--krebs/Zhosts/c2ft (renamed from Zhosts/c2ft)0
-rw-r--r--krebs/Zhosts/c2fthome (renamed from Zhosts/c2fthome)0
-rw-r--r--krebs/Zhosts/casino (renamed from Zhosts/casino)0
-rw-r--r--krebs/Zhosts/cat1 (renamed from Zhosts/cat1)0
-rw-r--r--krebs/Zhosts/cband (renamed from Zhosts/cband)0
-rw-r--r--krebs/Zhosts/cd (renamed from Zhosts/cd)0
-rw-r--r--krebs/Zhosts/cloudkrebs (renamed from Zhosts/cloudkrebs)0
-rw-r--r--krebs/Zhosts/darth (renamed from Zhosts/darth)0
-rw-r--r--krebs/Zhosts/dei (renamed from Zhosts/dei)0
-rw-r--r--krebs/Zhosts/destroy (renamed from Zhosts/destroy)0
-rw-r--r--krebs/Zhosts/devstar (renamed from Zhosts/devstar)0
-rw-r--r--krebs/Zhosts/eigenserv (renamed from Zhosts/eigenserv)0
-rw-r--r--krebs/Zhosts/elvis (renamed from Zhosts/elvis)0
-rw-r--r--krebs/Zhosts/eulerwalk (renamed from Zhosts/eulerwalk)0
-rw-r--r--krebs/Zhosts/exile (renamed from Zhosts/exile)0
-rw-r--r--krebs/Zhosts/exitium_mobilis (renamed from Zhosts/exitium_mobilis)0
-rw-r--r--krebs/Zhosts/falk (renamed from Zhosts/falk)0
-rw-r--r--krebs/Zhosts/fastpoke (renamed from Zhosts/fastpoke)0
-rw-r--r--krebs/Zhosts/filebitch (renamed from Zhosts/filebitch)0
-rw-r--r--krebs/Zhosts/filepimp (renamed from Zhosts/filepimp)0
-rw-r--r--krebs/Zhosts/flap (renamed from Zhosts/flap)0
-rw-r--r--krebs/Zhosts/foobar (renamed from Zhosts/foobar)0
-rw-r--r--krebs/Zhosts/fuerkrebs (renamed from Zhosts/fuerkrebs)0
-rw-r--r--krebs/Zhosts/go (renamed from Zhosts/go)0
-rw-r--r--krebs/Zhosts/gum (renamed from Zhosts/gum)0
-rw-r--r--krebs/Zhosts/heidi (renamed from Zhosts/heidi)0
-rw-r--r--krebs/Zhosts/horisa (renamed from Zhosts/horisa)0
-rw-r--r--krebs/Zhosts/horreum_magnus (renamed from Zhosts/horreum_magnus)0
-rw-r--r--krebs/Zhosts/incept (renamed from Zhosts/incept)0
-rw-r--r--krebs/Zhosts/ire (renamed from Zhosts/ire)0
-rw-r--r--krebs/Zhosts/ire2 (renamed from Zhosts/ire2)0
-rw-r--r--krebs/Zhosts/irkel (renamed from Zhosts/irkel)0
-rw-r--r--krebs/Zhosts/juhulian (renamed from Zhosts/juhulian)0
-rw-r--r--krebs/Zhosts/k2 (renamed from Zhosts/k2)0
-rw-r--r--krebs/Zhosts/kabinett (renamed from Zhosts/kabinett)0
-rw-r--r--krebs/Zhosts/kaepsele (renamed from Zhosts/kaepsele)0
-rw-r--r--krebs/Zhosts/kalle (renamed from Zhosts/kalle)0
-rw-r--r--krebs/Zhosts/karthus (renamed from Zhosts/karthus)0
-rw-r--r--krebs/Zhosts/khackplug (renamed from Zhosts/khackplug)0
-rw-r--r--krebs/Zhosts/kheurop (renamed from Zhosts/kheurop)0
-rw-r--r--krebs/Zhosts/kiosk (renamed from Zhosts/kiosk)0
-rw-r--r--krebs/Zhosts/krebsplug (renamed from Zhosts/krebsplug)0
-rw-r--r--krebs/Zhosts/kvasir (renamed from Zhosts/kvasir)0
-rw-r--r--krebs/Zhosts/laqueus (renamed from Zhosts/laqueus)0
-rw-r--r--krebs/Zhosts/linuxatom (renamed from Zhosts/linuxatom)0
-rw-r--r--krebs/Zhosts/luminos (renamed from Zhosts/luminos)0
-rw-r--r--krebs/Zhosts/machine (renamed from Zhosts/machine)0
-rw-r--r--krebs/Zhosts/makalu (renamed from Zhosts/makalu)0
-rw-r--r--krebs/Zhosts/mako (renamed from Zhosts/mako)0
-rw-r--r--krebs/Zhosts/miefda0 (renamed from Zhosts/miefda0)0
-rw-r--r--krebs/Zhosts/minikrebs (renamed from Zhosts/minikrebs)0
-rw-r--r--krebs/Zhosts/mkdir (renamed from Zhosts/mkdir)0
-rw-r--r--krebs/Zhosts/monitor (renamed from Zhosts/monitor)0
-rw-r--r--krebs/Zhosts/mors (renamed from Zhosts/mors)0
-rw-r--r--krebs/Zhosts/motor (renamed from Zhosts/motor)0
-rw-r--r--krebs/Zhosts/mu (renamed from Zhosts/mu)0
-rw-r--r--krebs/Zhosts/muhbaasu (renamed from Zhosts/muhbaasu)0
-rw-r--r--krebs/Zhosts/nomic (renamed from Zhosts/nomic)0
-rw-r--r--krebs/Zhosts/nomic2 (renamed from Zhosts/nomic2)0
-rw-r--r--krebs/Zhosts/nukular (renamed from Zhosts/nukular)0
-rw-r--r--krebs/Zhosts/omo (renamed from Zhosts/omo)0
-rw-r--r--krebs/Zhosts/pic (renamed from Zhosts/pic)0
-rw-r--r--krebs/Zhosts/pigstarter (renamed from Zhosts/pigstarter)0
-rw-r--r--krebs/Zhosts/pike (renamed from Zhosts/pike)0
-rw-r--r--krebs/Zhosts/pnp (renamed from Zhosts/pnp)0
-rw-r--r--krebs/Zhosts/pornocauster (renamed from Zhosts/pornocauster)0
-rw-r--r--krebs/Zhosts/radiotuxmini (renamed from Zhosts/radiotuxmini)0
-rw-r--r--krebs/Zhosts/random (renamed from Zhosts/random)0
-rw-r--r--krebs/Zhosts/raspafari (renamed from Zhosts/raspafari)0
-rw-r--r--krebs/Zhosts/reimae (renamed from Zhosts/reimae)0
-rw-r--r--krebs/Zhosts/rmdir (renamed from Zhosts/rmdir)0
-rw-r--r--krebs/Zhosts/robchina (renamed from Zhosts/robchina)0
-rw-r--r--krebs/Zhosts/rockit (renamed from Zhosts/rockit)0
-rw-r--r--krebs/Zhosts/rtjure_debian_oder_so (renamed from Zhosts/rtjure_debian_oder_so)0
-rw-r--r--krebs/Zhosts/rtjure_ras (renamed from Zhosts/rtjure_ras)0
-rw-r--r--krebs/Zhosts/rtjure_rdrlab_linkstation (renamed from Zhosts/rtjure_rdrlab_linkstation)0
-rw-r--r--krebs/Zhosts/rubus (renamed from Zhosts/rubus)0
-rw-r--r--krebs/Zhosts/senderechner (renamed from Zhosts/senderechner)0
-rw-r--r--krebs/Zhosts/serenity (renamed from Zhosts/serenity)0
-rw-r--r--krebs/Zhosts/seruundroid (renamed from Zhosts/seruundroid)0
-rw-r--r--krebs/Zhosts/sir_krebs_a_lot (renamed from Zhosts/sir_krebs_a_lot)0
-rw-r--r--krebs/Zhosts/skirfir (renamed from Zhosts/skirfir)0
-rw-r--r--krebs/Zhosts/sleipnir (renamed from Zhosts/sleipnir)0
-rw-r--r--krebs/Zhosts/smove (renamed from Zhosts/smove)0
-rw-r--r--krebs/Zhosts/sokrates (renamed from Zhosts/sokrates)0
-rw-r--r--krebs/Zhosts/sokrateslaptop (renamed from Zhosts/sokrateslaptop)0
-rw-r--r--krebs/Zhosts/soundflower (renamed from Zhosts/soundflower)0
-rw-r--r--krebs/Zhosts/steve (renamed from Zhosts/steve)0
-rw-r--r--krebs/Zhosts/tahoe (renamed from Zhosts/tahoe)0
-rw-r--r--krebs/Zhosts/taschenkrebs (renamed from Zhosts/taschenkrebs)0
-rw-r--r--krebs/Zhosts/terrapi (renamed from Zhosts/terrapi)0
-rw-r--r--krebs/Zhosts/thomasDOTde (renamed from Zhosts/thomasDOTde)0
-rw-r--r--krebs/Zhosts/tincdroid (renamed from Zhosts/tincdroid)0
-rw-r--r--krebs/Zhosts/tmpd (renamed from Zhosts/tmpd)0
-rw-r--r--krebs/Zhosts/tpsw (renamed from Zhosts/tpsw)0
-rw-r--r--krebs/Zhosts/tsp (renamed from Zhosts/tsp)0
-rw-r--r--krebs/Zhosts/ufo (renamed from Zhosts/ufo)0
-rw-r--r--krebs/Zhosts/uriel (renamed from Zhosts/uriel)0
-rw-r--r--krebs/Zhosts/vault (renamed from Zhosts/vault)0
-rw-r--r--krebs/Zhosts/voyager (renamed from Zhosts/voyager)0
-rw-r--r--krebs/Zhosts/wooktop (renamed from Zhosts/wooktop)0
-rw-r--r--krebs/Zhosts/wu (renamed from Zhosts/wu)0
-rw-r--r--krebs/Zhosts/ytart (renamed from Zhosts/ytart)0
-rw-r--r--krebs/Zhosts/zombiecancer (renamed from Zhosts/zombiecancer)0
-rw-r--r--krebs/Zpubkeys/deploy_wu.ssh.pub (renamed from Zpubkeys/deploy_wu.ssh.pub)0
-rw-r--r--krebs/Zpubkeys/lass.ssh.pub (renamed from Zpubkeys/lass.ssh.pub)0
-rw-r--r--krebs/Zpubkeys/makefu_arch.ssh.pub (renamed from Zpubkeys/makefu_arch.ssh.pub)0
-rw-r--r--krebs/Zpubkeys/makefu_omo.ssh.pub (renamed from Zpubkeys/makefu_omo.ssh.pub)0
-rw-r--r--krebs/Zpubkeys/makefu_tsp.ssh.pub (renamed from Zpubkeys/makefu_tsp.ssh.pub)0
-rw-r--r--krebs/Zpubkeys/mv_vod.ssh.pub (renamed from Zpubkeys/mv_vod.ssh.pub)0
-rw-r--r--krebs/Zpubkeys/tv_wu.ssh.pub (renamed from Zpubkeys/tv_wu.ssh.pub)0
-rw-r--r--krebs/Zpubkeys/uriel.ssh.pub (renamed from Zpubkeys/uriel.ssh.pub)0
-rw-r--r--tv/1systems/cd.nix2
-rw-r--r--tv/Zcerts/charybdis_cd.crt.pem (renamed from Zcerts/charybdis_cd.crt.pem)0
132 files changed, 7 insertions, 7 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 65ebad7b..5f338df6 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -303,11 +303,11 @@ let
};
users = addNames {
lass = {
- pubkey = readFile ../../Zpubkeys/lass.ssh.pub;
+ pubkey = readFile ../Zpubkeys/lass.ssh.pub;
mail = "lass@mors.retiolum";
};
uriel = {
- pubkey = readFile ../../Zpubkeys/uriel.ssh.pub;
+ pubkey = readFile ../Zpubkeys/uriel.ssh.pub;
mail = "lass@uriel.retiolum";
};
};
@@ -514,7 +514,7 @@ let
users = addNames {
makefu = {
mail = "makefu@pornocauster.retiolum";
- pubkey = readFile ../../Zpubkeys/makefu_arch.ssh.pub;
+ pubkey = readFile ../Zpubkeys/makefu_arch.ssh.pub;
};
};
};
@@ -685,11 +685,11 @@ let
users = addNames {
mv = {
mail = "mv@cd.retiolum";
- pubkey = readFile ../../Zpubkeys/mv_vod.ssh.pub;
+ pubkey = readFile ../Zpubkeys/mv_vod.ssh.pub;
};
tv = {
mail = "tv@wu.retiolum";
- pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub;
+ pubkey = readFile ../Zpubkeys/tv_wu.ssh.pub;
};
};
};
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 481d6565..4e70b78a 100644
--- a/krebs/3modules/retiolum.nix
+++ b/krebs/3modules/retiolum.nix
@@ -58,7 +58,7 @@ let
hosts = mkOption {
type = with types; either package path;
- default = ../../Zhosts;
+ default = ../Zhosts;
description = ''
If a path is given, then it will be used to generate an ad-hoc package.
'';