diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-14 17:04:32 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-14 17:04:32 +0100 |
| commit | 8114470587b5c0018cdfcb6b0c0da93bfece5a05 (patch) | |
| tree | 343ca79a42402fca2b66af3579aa8d11e891cd7f /makefu/1systems/gum.nix | |
| parent | 781573b9dd393aa4d2d7e34a1fa8d831441b545b (diff) | |
| parent | 6f150af8acf2195188518bf53d0330da7a4bb8f8 (diff) | |
Merge branch 'master' of gum:stockholm
Diffstat (limited to 'makefu/1systems/gum.nix')
| -rw-r--r-- | makefu/1systems/gum.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 75607aa46..417a020fa 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -14,14 +14,20 @@ in { # ../2configs/iodined.nix ../2configs/git/cgit-retiolum.nix ../2configs/mattermost-docker.nix + ../2configs/nginx/euer.test.nix ]; + nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; ###### stable krebs.build.target = "root@gum.krebsco.de"; krebs.build.host = config.krebs.hosts.gum; - + krebs.retiolum.extraConfig = '' + ListenAddress = ${external-ip} 53 + ListenAddress = ${external-ip} 655 + ListenAddress = ${external-ip} 21031 + ''; # Chat environment.systemPackages = with pkgs;[ @@ -53,10 +59,18 @@ in { 80 443 # tinc 655 + # tinc-shack + 21032 + # tinc-retiolum + 21031 ]; allowedUDPPorts = [ # tinc 655 53 + # tinc-retiolum + 21031 + # tinc-shack + 21032 ]; }; interfaces.et0.ip4 = [{ |