diff options
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 1 | ||||
| -rw-r--r-- | makefu/1systems/wry.nix | 40 | 
2 files changed, 27 insertions, 14 deletions
| diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 8f7f5ea7c..97cf86a4e 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -21,6 +21,7 @@        # applications        ../2configs/exim-retiolum.nix +      ../2configs/mail-client.nix        #../2configs/virtualization.nix        ../2configs/virtualization-virtualbox.nix        ../2configs/wwan.nix diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix index 819a208ac..a7ed93c43 100644 --- a/makefu/1systems/wry.nix +++ b/makefu/1systems/wry.nix @@ -5,38 +5,50 @@ let    ip = (lib.head config.krebs.build.host.nets.internet.addrs4);  in {    imports = [ -    ../../tv/2configs/CAC-CentOS-7-64bit.nix -    ../2configs/base.nix -    ../2configs/base-sources.nix -    ../2configs/tinc-basic-retiolum.nix +      # TODO: copy this config or move to krebs +      ../../tv/2configs/CAC-CentOS-7-64bit.nix +      ../2configs/base.nix +      ../2configs/base-sources.nix +      ../2configs/tinc-basic-retiolum.nix + +      ../2configs/iodined.nix + +      # Reaktor +      ../2configs/Reaktor/simpleExtend.nix    ]; +  krebs.Reaktor.enable = true; +    networking.firewall.allowPing = true;    networking.interfaces.enp2s1.ip4 = [ -      { -        address = ip; -        prefixLength = 24; -      } -    ]; -    networking.defaultGateway = "104.233.87.1"; -    networking.nameservers = [ -      "8.8.8.8" -    ]; +  { +    address = ip; +    prefixLength = 24; +  } +  ]; +  networking.defaultGateway = "104.233.87.1"; +  networking.nameservers = [ +    "8.8.8.8" +  ];    # based on ../../tv/2configs/CAC-Developer-2.nix    sound.enable = false;    # prepare graphs    nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; +    krebs.nginx.enable = true; +  krebs.retiolum-bootstrap.enable = true;    makefu.tinc_graphs.enable = true; +    makefu.tinc_graphs.krebsNginx = {      enable = true;      # TODO: remove hard-coded hostname      hostnames_complete  = [ "graphs.wry" ];      hostnames_anonymous = [ "graphs.krebsco.de" ];    }; -  networking.firewall.allowedTCPPorts = [80]; + +  networking.firewall.allowedTCPPorts = [ 53 80 443 ];    krebs.build = {      user = config.krebs.users.makefu; | 
