makefu: merge /Z -> krebs/Z

This commit is contained in:
makefu 2015-08-31 10:59:28 +02:00
parent 2eb8bcf9d1
commit cbac1a7595
3 changed files with 4 additions and 4 deletions

View File

@ -49,7 +49,7 @@
}; };
krebs.retiolum = { krebs.retiolum = {
enable = true; enable = true;
hosts = ../../Zhosts; hosts = ../../krebs/Zhosts;
connectTo = [ connectTo = [
"gum" "gum"
"pigstarter" "pigstarter"

View File

@ -63,11 +63,11 @@ in {
imports = [{ imports = [{
krebs.users.makefu-omo = { krebs.users.makefu-omo = {
name = "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 = { krebs.users.makefu-tsp = {
name = "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 = { krebs.git = {

View File

@ -4,7 +4,7 @@ with lib;
{ {
krebs.retiolum = { krebs.retiolum = {
enable = true; enable = true;
hosts = ../../Zhosts; hosts = ../../krebs/Zhosts;
connectTo = [ connectTo = [
"gum" "gum"
"pigstarter" "pigstarter"