summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-08-31 10:59:28 +0200
committermakefu <github@syntax-fehler.de>2015-08-31 10:59:28 +0200
commitcbac1a75959c96d37f6c24a38efce19e88dadca2 (patch)
treee0166a563689138e46cf329a2d51c6028f24f416
parent2eb8bcf9d1c293a8b28730c9a12d9a857c5a43a7 (diff)
makefu: merge /Z -> krebs/Z
-rw-r--r--makefu/1systems/repunit.nix2
-rw-r--r--makefu/2configs/cgit-retiolum.nix4
-rw-r--r--makefu/2configs/tinc-basic-retiolum.nix2
3 files changed, 4 insertions, 4 deletions
diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix
index 503fe8f65..d98ff17c1 100644
--- a/makefu/1systems/repunit.nix
+++ b/makefu/1systems/repunit.nix
@@ -49,7 +49,7 @@
};
krebs.retiolum = {
enable = true;
- hosts = ../../Zhosts;
+ hosts = ../../krebs/Zhosts;
connectTo = [
"gum"
"pigstarter"
diff --git a/makefu/2configs/cgit-retiolum.nix b/makefu/2configs/cgit-retiolum.nix
index 8d9439569..a40dabb3f 100644
--- a/makefu/2configs/cgit-retiolum.nix
+++ b/makefu/2configs/cgit-retiolum.nix
@@ -63,11 +63,11 @@ in {
imports = [{
krebs.users.makefu-omo = {
name = "makefu-omo" ;
- pubkey= with builtins; readFile ../../Zpubkeys/makefu_omo.ssh.pub;
+ pubkey= with builtins; readFile ../../krebs/Zpubkeys/makefu_omo.ssh.pub;
};
krebs.users.makefu-tsp = {
name = "makefu-tsp" ;
- pubkey= with builtins; readFile ../../Zpubkeys/makefu_tsp.ssh.pub;
+ pubkey= with builtins; readFile ../../krebs/Zpubkeys/makefu_tsp.ssh.pub;
};
}];
krebs.git = {
diff --git a/makefu/2configs/tinc-basic-retiolum.nix b/makefu/2configs/tinc-basic-retiolum.nix
index cb1991bd6..fd6d1683d 100644
--- a/makefu/2configs/tinc-basic-retiolum.nix
+++ b/makefu/2configs/tinc-basic-retiolum.nix
@@ -4,7 +4,7 @@ with lib;
{
krebs.retiolum = {
enable = true;
- hosts = ../../Zhosts;
+ hosts = ../../krebs/Zhosts;
connectTo = [
"gum"
"pigstarter"