summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-01-22 11:35:00 +0100
committermakefu <github@syntax-fehler.de>2016-01-22 11:35:00 +0100
commitb0f7eb47dc44f657e0b18f0fe3d91408505a2e4a (patch)
tree2bc7e1332b588d877be21e1c7bc8f8195794a051 /makefu/2configs
parentb31d847a7858f143d1f783efa9230c9aac60c501 (diff)
parented4e0241d5aba830f31a7271435c93c7299b884b (diff)
Merge branch 'master' of gum:stockholm into fix-cert
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/git/cgit-retiolum.nix3
-rw-r--r--makefu/2configs/tinc-basic-retiolum.nix1
2 files changed, 3 insertions, 1 deletions
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 35bb169cf..7d85eb8d1 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -16,6 +16,9 @@ let
desc = "Tinc Advanced Graph Generation";
};
cac = { };
+ init-stockholm = {
+ desc = "Init stuff for stockholm";
+ };
};
priv-repos = mapAttrs make-priv-repo {
diff --git a/makefu/2configs/tinc-basic-retiolum.nix b/makefu/2configs/tinc-basic-retiolum.nix
index 2abf4f188..f49c596fc 100644
--- a/makefu/2configs/tinc-basic-retiolum.nix
+++ b/makefu/2configs/tinc-basic-retiolum.nix
@@ -4,7 +4,6 @@ with lib;
{
krebs.retiolum = {
enable = true;
- hosts = ../../krebs/Zhosts;
connectTo = [
"gum"
"pigstarter"