summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-08-31 10:47:29 +0200
committermakefu <github@syntax-fehler.de>2015-08-31 10:47:29 +0200
commit2eb8bcf9d1c293a8b28730c9a12d9a857c5a43a7 (patch)
treec8a1d55a148e59f51a400e0d5dc11780d4e4005c /krebs/3modules
parent0acd7f23e1e3adf4bf1427f186a7bf5505ff910d (diff)
parent83f06535de527c7470f8ff9c8b5e3a4632cf7cb9 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/default.nix13
-rw-r--r--krebs/3modules/github-hosts-sync.nix6
-rw-r--r--krebs/3modules/retiolum.nix2
3 files changed, 10 insertions, 11 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index af0466c3c..5f338df62 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -272,6 +272,7 @@ let
'';
};
};
+ secure = true;
};
mors = {
cores = 2;
@@ -302,12 +303,12 @@ 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;
- mail = "uriel@mors.retiolum";
+ pubkey = readFile ../Zpubkeys/uriel.ssh.pub;
+ mail = "lass@uriel.retiolum";
};
};
};
@@ -513,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;
};
};
};
@@ -684,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/github-hosts-sync.nix b/krebs/3modules/github-hosts-sync.nix
index 0274b9d15..dbc0cc1de 100644
--- a/krebs/3modules/github-hosts-sync.nix
+++ b/krebs/3modules/github-hosts-sync.nix
@@ -61,9 +61,9 @@ let
${cfg.ssh-identity-file} \
"$ssh_identity_file_target"
- ln -snf ${kpkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
+ ln -snf ${pkgs.github-known_hosts} ${cfg.dataDir}/.ssh/known_hosts
'';
- ExecStart = "${kpkgs.github-hosts-sync}/bin/github-hosts-sync";
+ ExecStart = "${pkgs.github-hosts-sync}/bin/github-hosts-sync";
};
};
@@ -77,7 +77,5 @@ let
name = "github-hosts-sync";
uid = 3220554646; # genid github-hosts-sync
};
-
- kpkgs = import ../../krebs/5pkgs { inherit pkgs; };
in
out
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix
index 481d6565c..4e70b78aa 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.
'';