summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-01-03 23:15:19 +0100
committerlassulus <lassulus@lassul.us>2019-01-03 23:15:19 +0100
commit58886abed9f24c2447e41d37c27e7add023fa621 (patch)
tree4e29ee6fad1fc0450a040ce57d9841e78c666454 /makefu/1systems
parent7176d12ff89a2637f8ca0f828c4f05a6543885d1 (diff)
parent6044ffe3a53ab7745f413847ffe87fbf7a4d11f8 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/cake/config.nix3
-rw-r--r--makefu/1systems/gum/config.nix1
2 files changed, 3 insertions, 1 deletions
diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
index 1a617e52d..2491352eb 100644
--- a/makefu/1systems/cake/config.nix
+++ b/makefu/1systems/cake/config.nix
@@ -38,6 +38,9 @@
})
];
networking.wireless.enable = true;
+ users.extraUsers.root.openssh.authorizedKeys.keys = [
+ config.krebs.users.Mic92.pubkey
+ ];
# File systems configuration for using the installer's partition layout
fileSystems = {
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 97b4555a5..6024260dc 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -124,7 +124,6 @@ in {
<stockholm/makefu/2configs/nginx/misa-felix-hochzeit.ml.nix>
# <stockholm/makefu/2configs/nginx/gold.krebsco.de.nix>
<stockholm/makefu/2configs/nginx/iso.euer.nix>
- <stockholm/krebs/2configs/cache.nsupdate.info.nix>
<stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix>
<stockholm/makefu/2configs/deployment/graphs.nix>