diff options
author | lassulus <lassulus@lassul.us> | 2017-12-31 03:02:48 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-12-31 03:02:48 +0100 |
commit | f2fe825333854ba8f07a95200c67194aeae0fb5f (patch) | |
tree | 3fb255c276a0d0bc305f619a944b8204a64bc702 /makefu/1systems/gum/config.nix | |
parent | d5a69ce257d44c804d1edb679e5667eae6a71853 (diff) | |
parent | 181bd547f370848df1a49f886355e6fe8853c02f (diff) |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/gum/config.nix')
-rw-r--r-- | makefu/1systems/gum/config.nix | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index b66ef1ab8..1fe0b62f9 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -48,9 +48,15 @@ in { <stockholm/makefu/2configs/share/gum.nix> # <stockholm/makefu/2configs/sabnzbd.nix> <stockholm/makefu/2configs/torrent.nix> - <stockholm/makefu/2configs/iodined.nix> + <stockholm/makefu/2configs/mosh.nix> + + # network <stockholm/makefu/2configs/vpn/openvpn-server.nix> + <stockholm/makefu/2configs/vpn/vpnws/server.nix> <stockholm/makefu/2configs/dnscrypt/server.nix> + <stockholm/makefu/2configs/iodined.nix> + + # buildbot <stockholm/makefu/2configs/remote-build/slave.nix> ## Web @@ -103,15 +109,16 @@ in { #} { # wireguard server networking.firewall.allowedUDPPorts = [ 51820 ]; - #networking.wireguard.interfaces.wg0 = { - # ips = [ "10.244.0.1/24" ]; - # privateKeyFile = (toString <secrets>) + "/wireguard.key"; - # allowedIPsAsRoutes = true; - # peers = [{ - # allowedIPs = [ "0.0.0.0/0" "::/0" ]; - # publicKey = "fe5smvKVy5GAn7EV4w4tav6mqIAKhGWQotm7dRuRt1g="; - # }]; - #}; + networking.wireguard.interfaces.wg0 = { + ips = [ "10.244.0.1/24" ]; + privateKeyFile = (toString <secrets>) + "/wireguard.key"; + allowedIPsAsRoutes = true; + peers = [{ + # allowedIPs = [ "0.0.0.0/0" "::/0" ]; + allowedIPs = [ "10.244.0.2/32" ]; + publicKey = "fe5smvKVy5GAn7EV4w4tav6mqIAKhGWQotm7dRuRt1g="; + }]; + }; } ]; |