From b2c537ebbdd966c7b6a7838e07b09e9d3c048c15 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Sat, 28 Oct 2023 13:47:18 +0200 Subject: [PATCH] whitespaces and increase nextcloud upload limit --- server/modules/nextcloud.nix | 8 +++--- server/modules/static-ip-server.nix | 2 +- server/modules/wireguard.nix | 40 +++++++++++++++++------------ 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/server/modules/nextcloud.nix b/server/modules/nextcloud.nix index 201da4f..2fc7f6d 100644 --- a/server/modules/nextcloud.nix +++ b/server/modules/nextcloud.nix @@ -11,7 +11,7 @@ owner = "nginx"; group = "nginx"; }; - # Enable Nginx + # Enable Nginx services.nginx = { enable = true; @@ -30,9 +30,9 @@ serverAliases = [ "192.168.2.1" ]; ## Force HTTP redirect to HTTPS forceSSL = true; - #sslTrustedCertificate = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - sslCertificate = config.age.secrets.nextcloud-cert.path ; - sslCertificateKey = config.age.secrets.nextcloud-key.path ; + #sslTrustedCertificate = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + sslCertificate = config.age.secrets.nextcloud-cert.path; + sslCertificateKey = config.age.secrets.nextcloud-key.path; ## LetsEncrypt #enableACME = true; }; diff --git a/server/modules/static-ip-server.nix b/server/modules/static-ip-server.nix index 56b9a37..5175547 100644 --- a/server/modules/static-ip-server.nix +++ b/server/modules/static-ip-server.nix @@ -5,7 +5,7 @@ firewall = { enable = true; allowedTCPPorts = [ 22 53 80 443 ]; - allowedUDPPorts = [ 53 ]; + allowedUDPPorts = [ 53 5000 ]; }; nameservers = [ "127.0.0.1" diff --git a/server/modules/wireguard.nix b/server/modules/wireguard.nix index 67f6ecb..1338e18 100644 --- a/server/modules/wireguard.nix +++ b/server/modules/wireguard.nix @@ -21,7 +21,7 @@ allowedIPs = [ "192.168.2.2/32" ]; - persistentKeepalive = 25; + persistentKeepalive = 25; endpoint = "192.168.0.6:51820"; publicKey = "dUBPIEnAiHIZCMjqV0ya8qotN3UnMhlEVyGNQcR3gVI="; } @@ -29,60 +29,66 @@ allowedIPs = [ "192.168.2.3/32" ]; - persistentKeepalive = 25; + persistentKeepalive = 25; endpoint = "kopatz.ddns.net:51820"; publicKey = "Eg5ZS3zN05mJ/gct6wJlwVAHTlXpkhxFfUd7yscANV0="; } - { + { allowedIPs = [ "192.168.2.4/32" ]; - persistentKeepalive = 25; + persistentKeepalive = 25; endpoint = "kopatz.ddns.net:51820"; publicKey = "8Eigfs+k2k2WPaMn+SqDmlSHdMv+I+xcBr/2qhtpGzI="; } - - { + { allowedIPs = [ "192.168.2.20/32" ]; - persistentKeepalive = 25; + persistentKeepalive = 25; endpoint = "kopatz.ddns.net:51820"; publicKey = "25u1RSfjsx3wb1DMeTm0pvUfUkG7zTjGaN+m0w6ZjCw="; } - { + { allowedIPs = [ "192.168.2.21/32" ]; - persistentKeepalive = 25; + persistentKeepalive = 25; endpoint = "kopatz.ddns.net:51820"; publicKey = "S+8F+yxSQvjjoU44LRYqRv1YulqmOKumUtYo/YIh7X8="; } - { + { allowedIPs = [ "192.168.2.22/32" ]; - persistentKeepalive = 25; + persistentKeepalive = 25; endpoint = "kopatz.ddns.net:51820"; - publicKey = "/dIW7K49vB9HOghFeXvcY7wu2utQltuv6RfgCbxZwlk="; + publicKey = "/dIW7K49vB9HOgheXvcY7wu2utQltuv6RfgCbxZwlk="; } - { + { allowedIPs = [ "192.168.2.23/32" ]; - persistentKeepalive = 25; + persistentKeepalive = 25; endpoint = "kopatz.ddns.net:51820"; publicKey = "89rjQXNcyCRUCihqfqcOnctWmhiNR8snpRFF6dyHAmk="; } - { + { allowedIPs = [ "192.168.2.24/32" ]; - persistentKeepalive = 25; + persistentKeepalive = 25; endpoint = "kopatz.ddns.net:51820"; publicKey = "adaWtboVz3UhpNBKFirs7slbU2+Y3GaV5yS2EoafwVU="; } - + { + allowedIPs = [ + "192.168.2.5/32" + ]; + persistentKeepalive = 25; + endpoint = "kopatz.ddns.net:51820"; + publicKey = "g5uTlA1IciXgtSbECjhVis0dajRAc53Oa7Hz6dUI+0Q="; + } ]; privateKeyFile = config.age.secrets.wireguard-private.path; };