summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-01-29 23:59:45 +0100
committerlassulus <lassulus@lassul.us>2022-01-29 23:59:45 +0100
commit1fe702a0830ab1065bd993005b1230336cff7c62 (patch)
treeaf359c2bf0afec9a400b53fc354cde9888f0689f /makefu/1systems
parent7ec575267cb7d8e7f6636911ececddccac062ab6 (diff)
parent3de63d2e464029ae7b2f3cc8381d9e000adcc181 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/gum/config.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index dcb3dc1d4..a9d9b661f 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -51,15 +51,17 @@ in {
# networking
# <stockholm/makefu/2configs/vpn/vpnws/server.nix>
#<stockholm/makefu/2configs/dnscrypt/server.nix>
- <stockholm/makefu/2configs/iodined.nix>
+ # <stockholm/makefu/2configs/iodined.nix>
# <stockholm/makefu/2configs/backup.nix>
<stockholm/makefu/2configs/tinc/retiolum.nix>
{ # bonus retiolum config for connecting more hosts
krebs.tinc.retiolum = {
- extraConfig = ''
+ extraConfig = lib.mkForce ''
ListenAddress = ${external-ip} 53
ListenAddress = ${external-ip} 655
ListenAddress = ${external-ip} 21031
+ StrictSubnets = yes
+ LocalDiscovery = no
'';
connectTo = [
"prism" "ni" "enklave" "eve" "dishfire"
@@ -112,6 +114,7 @@ in {
#<stockholm/makefu/2configs/retroshare.nix>
## <stockholm/makefu/2configs/ipfs.nix>
#<stockholm/makefu/2configs/syncthing.nix>
+ <stockholm/makefu/2configs/sync>
# <stockholm/makefu/2configs/opentracker.nix>
@@ -122,7 +125,6 @@ in {
{ makefu.backup.server.repo = "/var/backup/borg"; }
<stockholm/makefu/2configs/backup/server.nix>
<stockholm/makefu/2configs/backup/state.nix>
- <stockholm/makefu/2configs/iodined.nix>
<stockholm/makefu/2configs/bitlbee.nix>
<stockholm/makefu/2configs/wireguard/server.nix>
<stockholm/makefu/2configs/wireguard/wiregrill.nix>
@@ -160,7 +162,7 @@ in {
# <stockholm/makefu/2configs/deployment/systemdultras-rss.nix>
# <stockholm/makefu/2configs/shiori.nix>
- # <stockholm/makefu/2configs/workadventure>
+ #<stockholm/makefu/2configs/workadventure>
<stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
<stockholm/makefu/2configs/bgt/hidden_service.nix>