summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-10-10 22:33:32 +0200
committerlassulus <lassulus@lassul.us>2017-10-10 22:33:32 +0200
commitc5ff2b0e75149df3dbe208d61035dc544a9662b5 (patch)
treebbc6489fdc7f583688c39713a60b8a8b0d035b9f /makefu/1systems
parentcb8a0ef2b4ebb37c76ae101f44a5b97879219a08 (diff)
parentb9731d4851ec4f49235c0ea9e460bd96d2ff29a9 (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/latte/config.nix1
-rw-r--r--makefu/1systems/latte/source.nix3
3 files changed, 6 insertions, 1 deletions
diff --git a/makefu/1systems/cake/config.nix b/makefu/1systems/cake/config.nix
index e8438e50d..c287c28df 100644
--- a/makefu/1systems/cake/config.nix
+++ b/makefu/1systems/cake/config.nix
@@ -6,6 +6,9 @@
# configure your hw:
# <stockholm/makefu/2configs/save-diskspace.nix>
];
+ users.extraUsers.root.openssh.authorizedKeys.keys = [
+ config.krebs.users.tv.pubkey
+ ];
krebs = {
enable = true;
tinc.retiolum.enable = true;
diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index d532f216f..3b06660c6 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -26,6 +26,7 @@ in {
<stockholm/makefu/2configs/zsh-user.nix>
# Services
<stockholm/makefu/2configs/remote-build/slave.nix>
+ <stockholm/makefu/2configs/torrent.nix>
];
krebs = {
diff --git a/makefu/1systems/latte/source.nix b/makefu/1systems/latte/source.nix
index d997fb3f0..d9600909a 100644
--- a/makefu/1systems/latte/source.nix
+++ b/makefu/1systems/latte/source.nix
@@ -1,3 +1,4 @@
import <stockholm/makefu/source.nix> {
- name="latte";
+ name = "latte";
+ torrent = true;
}