diff options
| author | tv <tv@krebsco.de> | 2016-03-16 00:13:58 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-03-16 00:13:58 +0100 |
| commit | 2452d211737e0544e9cc92ae44da69940632a750 (patch) | |
| tree | ecb0e2d9932805a6b40be7e09ab5206201e7aba7 /makefu/1systems/gum.nix | |
| parent | 13df24f8f09469c32077ded463d99033042e25ee (diff) | |
| parent | 03a72ef958055c958992c4fbde618c1e68bfff6e (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/gum.nix')
| -rw-r--r-- | makefu/1systems/gum.nix | 21 |
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" ]; |