diff --git a/modules/system/services/general/ssh/fail2ban/default.nix b/modules/system/services/general/ssh/fail2ban/default.nix index 7e2e3af..acc00f8 100644 --- a/modules/system/services/general/ssh/fail2ban/default.nix +++ b/modules/system/services/general/ssh/fail2ban/default.nix @@ -3,7 +3,7 @@ services.fail2ban = { enable = true; maxretry = 5; - bantime = "5m"; + bantime = "10m"; }; environment.persistence."/persist".directories = [ "/var/lib/fail2ban" ]; diff --git a/modules/system/services/server/ddclient/default.nix b/modules/system/services/server/ddclient/default.nix index ab66c91..40f3ce9 100644 --- a/modules/system/services/server/ddclient/default.nix +++ b/modules/system/services/server/ddclient/default.nix @@ -12,7 +12,6 @@ "*.${config.domains.jim1}" "sv.${config.domains.jim1}" "git.${config.domains.jim1}" - "rtmp.${config.domains.jim1}" "turn.${config.domains.jim1}" "dew.${config.domains.jim1}" "john.${config.domains.jim1}" diff --git a/modules/system/services/server/forgejo/default.nix b/modules/system/services/server/forgejo/default.nix index 5044ab3..081e13d 100644 --- a/modules/system/services/server/forgejo/default.nix +++ b/modules/system/services/server/forgejo/default.nix @@ -32,6 +32,5 @@ }; }; - # Allow Forgejo's SSH to work networking.firewall.allowedTCPPorts = [ 2299 ]; } diff --git a/modules/system/services/server/nginx/virtualhosts/jimDomain1/default.nix b/modules/system/services/server/nginx/virtualhosts/jimDomain1/default.nix index 9b81395..38a60af 100644 --- a/modules/system/services/server/nginx/virtualhosts/jimDomain1/default.nix +++ b/modules/system/services/server/nginx/virtualhosts/jimDomain1/default.nix @@ -1,35 +1,31 @@ { config, ... }: { - services.nginx.virtualHosts = { - "${config.domains.jim1}" = { - enableACME = true; - addSSL = true; - root = "/var/www/Jimbo-Landing-Page"; - locations = { - "/.well-known/matrix/client" = { - extraConfig = '' - default_type application/json; - return 200 ' - { - "m.homeserver": { - "base_url": "https://matrix.${config.domains.jim1}" - }, - "m.identity_server": { - "base_url": "https://matrix.org" - }, - "org.matrix.msc3575.proxy": { - "url": "https://matrix.${config.domains.jim1}" - } - }'; - ''; - }; - "/.well-known/matrix/server" = { - extraConfig = '' - default_type application/json; - return 200 '{"m.server": "matrix.${config.domains.jim1}:443"}'; - ''; - }; - }; + services.nginx.virtualHosts."${config.domains.jim1}" = { + enableACME = true; + addSSL = true; + root = "/var/www/Jimbo-Landing-Page"; + locations = { + "/.well-known/matrix/client".extraConfig = '' + default_type application/json; + return 200 ' + { + "m.homeserver": { + "base_url": "https://matrix.${config.domains.jim1}" + }, + "m.identity_server": { + "base_url": "https://matrix.org" + }, + "org.matrix.msc3575.proxy": { + "url": "https://matrix.${config.domains.jim1}" + } + } + '; + ''; + + "/.well-known/matrix/server".extraConfig = '' + default_type application/json; + return 200 '{ "m.server": "matrix.${config.domains.jim1}:443" }'; + ''; }; }; } diff --git a/modules/system/services/server/snowflake/default.nix b/modules/system/services/server/snowflake/default.nix deleted file mode 100644 index 6c9a989..0000000 --- a/modules/system/services/server/snowflake/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - services.snowflake-proxy.enable = true; -} diff --git a/modules/system/services/server/social/matrix/element/default.nix b/modules/system/services/server/social/matrix/element/default.nix index 38ffb13..e0f756b 100644 --- a/modules/system/services/server/social/matrix/element/default.nix +++ b/modules/system/services/server/social/matrix/element/default.nix @@ -3,11 +3,9 @@ imports = [ ./nginx ]; nixpkgs.config.element-web.conf = { - default_server_config = { - "m.homeserver" = { - base_url = "https://matrix.${config.domains.jim1}"; - server_name = "matrix.${config.domains.jim1}"; - }; + default_server_config."m.homeserver" = { + base_url = "https://matrix.${config.domains.jim1}"; + server_name = "matrix.${config.domains.jim1}"; }; branding = { #welcome_background_url = "https://staging.${config.domains.jim1}/images/backgrounds/template-background.png"; diff --git a/modules/system/services/server/social/pixelfed/default.nix b/modules/system/services/server/social/pixelfed/default.nix index 6e4667d..d53d371 100644 --- a/modules/system/services/server/social/pixelfed/default.nix +++ b/modules/system/services/server/social/pixelfed/default.nix @@ -7,7 +7,7 @@ settings = { APP_NAME = ''"Jimbo's Pixelfed"''; INSTANCE_DESCRIPTION = ''"The Jimbosfiles Pixelfed Instance"''; - INSTANCE_CONTACT_EMAIL = "jimbo@${config.domains.jim2}"; + INSTANCE_CONTACT_EMAIL = "contact@${config.domains.jim2}"; OPEN_REGISTRATION = true; APP_LOCALE = "en"; INSTANCE_DISCOVER_PUBLIC = true;