summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/gum.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-03-15 14:14:29 +0100
committerlassulus <lass@aidsballs.de>2016-03-15 14:14:29 +0100
commit72939a2d6f45950dbfa6ec0815eae62e83d02630 (patch)
treed35ae568feeb1d1110be316ba8d434308e0aa780 /makefu/1systems/gum.nix
parentdb3dd77f6de5964bcaa265bf8e5863d7647932f5 (diff)
parent2e317bfe747ec968d3b933ae4c0df68ad204021c (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/gum.nix')
-rw-r--r--makefu/1systems/gum.nix21
1 files changed, 14 insertions, 7 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index 906c72de4..e784fdc12 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -7,7 +7,6 @@ let
in {
imports = [
../.
- ../2configs/tinc-basic-retiolum.nix
../2configs/headless.nix
../2configs/fs/simple-swap.nix
../2configs/fs/single-partition-ext4.nix
@@ -25,15 +24,23 @@ in {
];
services.smartd.devices = [ { device = "/dev/sda";} ];
- nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
###### stable
krebs.build.host = config.krebs.hosts.gum;
- krebs.retiolum.extraConfig = ''
- ListenAddress = ${external-ip} 53
- ListenAddress = ${external-ip} 655
- ListenAddress = ${external-ip} 21031
- '';
+ krebs.retiolum = {
+ enable = true;
+ extraConfig = ''
+ ListenAddress = ${external-ip} 53
+ ListenAddress = ${external-ip} 655
+ ListenAddress = ${external-ip} 21031
+ '';
+ connectTo = [
+ "muhbaasu" "tahoe" "flap" "wry"
+ "ire" "cd" "mkdir" "rmdir"
+ "fastpoke" "prism" "dishfire" "echelon" "cloudkrebs"
+ ];
+ };
+
krebs.nginx.servers.cgit.server-names = [
"cgit.euer.krebsco.de"
];