diff options
| author | lassulus <lassulus@lassul.us> | 2022-01-09 18:04:01 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-01-09 18:04:01 +0100 |
| commit | 63f8fe674ead768925d9083b628505a27a522064 (patch) | |
| tree | fc3b23ad33e8855dfd1e752c3931b60ea503d6d5 /makefu/1systems/gum/config.nix | |
| parent | 66bcb802f5a4fe9dac92b0387ba3ad5a2915a173 (diff) | |
| parent | 757d2ff5a959f957bac364719781285ca1aa36b3 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/gum/config.nix')
| -rw-r--r-- | makefu/1systems/gum/config.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 39c0554e0..dcb3dc1d4 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -49,7 +49,6 @@ in { # <stockholm/makefu/2configs/gui/xpra.nix> # networking - <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> @@ -63,7 +62,7 @@ in { ListenAddress = ${external-ip} 21031 ''; connectTo = [ - "prism" "ni" "enklave" "eve" "archprism" + "prism" "ni" "enklave" "eve" "dishfire" ]; }; networking.firewall = { @@ -117,7 +116,7 @@ in { ## network - <stockholm/makefu/2configs/vpn/openvpn-server.nix> + # <stockholm/makefu/2configs/vpn/openvpn-server.nix> # <stockholm/makefu/2configs/vpn/vpnws/server.nix> <stockholm/makefu/2configs/binary-cache/server.nix> { makefu.backup.server.repo = "/var/backup/borg"; } @@ -156,6 +155,7 @@ in { <stockholm/makefu/2configs/deployment/boot-euer.nix> <stockholm/makefu/2configs/deployment/gecloudpad> <stockholm/makefu/2configs/deployment/docker/archiveteam-warrior.nix> + <stockholm/makefu/2configs/deployment/mediengewitter.de.nix> <stockholm/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix> # <stockholm/makefu/2configs/deployment/systemdultras-rss.nix> @@ -181,7 +181,7 @@ in { ## Temporary: # <stockholm/makefu/2configs/temp/rst-issue.nix> <stockholm/makefu/2configs/virtualisation/docker.nix> - <stockholm/makefu/2configs/virtualisation/libvirt.nix> + #<stockholm/makefu/2configs/virtualisation/libvirt.nix> # krebs infrastructure services # <stockholm/makefu/2configs/stats/server.nix> |