More service changes

This commit is contained in:
Jimbo 2024-11-13 06:23:13 -05:00
parent e43f8c27a1
commit 54855a0d33
7 changed files with 31 additions and 43 deletions

View file

@ -3,7 +3,7 @@
services.fail2ban = { services.fail2ban = {
enable = true; enable = true;
maxretry = 5; maxretry = 5;
bantime = "5m"; bantime = "10m";
}; };
environment.persistence."/persist".directories = [ "/var/lib/fail2ban" ]; environment.persistence."/persist".directories = [ "/var/lib/fail2ban" ];

View file

@ -12,7 +12,6 @@
"*.${config.domains.jim1}" "*.${config.domains.jim1}"
"sv.${config.domains.jim1}" "sv.${config.domains.jim1}"
"git.${config.domains.jim1}" "git.${config.domains.jim1}"
"rtmp.${config.domains.jim1}"
"turn.${config.domains.jim1}" "turn.${config.domains.jim1}"
"dew.${config.domains.jim1}" "dew.${config.domains.jim1}"
"john.${config.domains.jim1}" "john.${config.domains.jim1}"

View file

@ -32,6 +32,5 @@
}; };
}; };
# Allow Forgejo's SSH to work
networking.firewall.allowedTCPPorts = [ 2299 ]; networking.firewall.allowedTCPPorts = [ 2299 ];
} }

View file

@ -1,35 +1,31 @@
{ config, ... }: { config, ... }:
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts."${config.domains.jim1}" = {
"${config.domains.jim1}" = { enableACME = true;
enableACME = true; addSSL = true;
addSSL = true; root = "/var/www/Jimbo-Landing-Page";
root = "/var/www/Jimbo-Landing-Page"; locations = {
locations = { "/.well-known/matrix/client".extraConfig = ''
"/.well-known/matrix/client" = { default_type application/json;
extraConfig = '' return 200 '
default_type application/json; {
return 200 ' "m.homeserver": {
{ "base_url": "https://matrix.${config.domains.jim1}"
"m.homeserver": { },
"base_url": "https://matrix.${config.domains.jim1}" "m.identity_server": {
}, "base_url": "https://matrix.org"
"m.identity_server": { },
"base_url": "https://matrix.org" "org.matrix.msc3575.proxy": {
}, "url": "https://matrix.${config.domains.jim1}"
"org.matrix.msc3575.proxy": { }
"url": "https://matrix.${config.domains.jim1}" }
} ';
}'; '';
'';
}; "/.well-known/matrix/server".extraConfig = ''
"/.well-known/matrix/server" = { default_type application/json;
extraConfig = '' return 200 '{ "m.server": "matrix.${config.domains.jim1}:443" }';
default_type application/json; '';
return 200 '{"m.server": "matrix.${config.domains.jim1}:443"}';
'';
};
};
}; };
}; };
} }

View file

@ -1,4 +0,0 @@
{ ... }:
{
services.snowflake-proxy.enable = true;
}

View file

@ -3,11 +3,9 @@
imports = [ ./nginx ]; imports = [ ./nginx ];
nixpkgs.config.element-web.conf = { nixpkgs.config.element-web.conf = {
default_server_config = { default_server_config."m.homeserver" = {
"m.homeserver" = { base_url = "https://matrix.${config.domains.jim1}";
base_url = "https://matrix.${config.domains.jim1}"; server_name = "matrix.${config.domains.jim1}";
server_name = "matrix.${config.domains.jim1}";
};
}; };
branding = { branding = {
#welcome_background_url = "https://staging.${config.domains.jim1}/images/backgrounds/template-background.png"; #welcome_background_url = "https://staging.${config.domains.jim1}/images/backgrounds/template-background.png";

View file

@ -7,7 +7,7 @@
settings = { settings = {
APP_NAME = ''"Jimbo's Pixelfed"''; APP_NAME = ''"Jimbo's Pixelfed"'';
INSTANCE_DESCRIPTION = ''"The Jimbosfiles Pixelfed Instance"''; INSTANCE_DESCRIPTION = ''"The Jimbosfiles Pixelfed Instance"'';
INSTANCE_CONTACT_EMAIL = "jimbo@${config.domains.jim2}"; INSTANCE_CONTACT_EMAIL = "contact@${config.domains.jim2}";
OPEN_REGISTRATION = true; OPEN_REGISTRATION = true;
APP_LOCALE = "en"; APP_LOCALE = "en";
INSTANCE_DISCOVER_PUBLIC = true; INSTANCE_DISCOVER_PUBLIC = true;