From 872abb1522ab03f8bc75145fe913d739e3dadd88 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Wed, 1 Jan 2025 23:14:44 -0500 Subject: [PATCH] Remove lemmy, wasn't using it --- .../services/server/forgejo/default.nix | 4 ++-- .../services/server/forgejo/nginx/default.nix | 2 +- .../system/services/server/social/default.nix | 1 - .../services/server/social/lemmy/default.nix | 20 ------------------- .../server/social/lemmy/nginx/default.nix | 7 ------- .../server/social/owncast/nginx/default.nix | 2 +- 6 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 modules/system/services/server/social/lemmy/default.nix delete mode 100644 modules/system/services/server/social/lemmy/nginx/default.nix diff --git a/modules/system/services/server/forgejo/default.nix b/modules/system/services/server/forgejo/default.nix index 8c83cbe..1efee67 100644 --- a/modules/system/services/server/forgejo/default.nix +++ b/modules/system/services/server/forgejo/default.nix @@ -7,8 +7,8 @@ enable = true; settings = { server = { - DOMAIN = "git.${config.domains.p1}"; - ROOT_URL = "https://git.${config.domains.p1}:443"; + DOMAIN = "git.${config.domains.p2}"; + ROOT_URL = "https://git.${config.domains.p2}:443"; HTTP_PORT = 3110; SSH_PORT = 2299; START_SSH_SERVER = true; diff --git a/modules/system/services/server/forgejo/nginx/default.nix b/modules/system/services/server/forgejo/nginx/default.nix index 1236dcf..6deefbf 100644 --- a/modules/system/services/server/forgejo/nginx/default.nix +++ b/modules/system/services/server/forgejo/nginx/default.nix @@ -1,6 +1,6 @@ { lib, config, ... }: { - services.nginx.virtualHosts."git.${config.domains.p1}" = lib.mkIf config.services.forgejo.enable { + services.nginx.virtualHosts."git.${config.domains.p2}" = lib.mkIf config.services.forgejo.enable { enableACME = true; forceSSL = true; locations."/" = { diff --git a/modules/system/services/server/social/default.nix b/modules/system/services/server/social/default.nix index 678a2e0..6761bf5 100644 --- a/modules/system/services/server/social/default.nix +++ b/modules/system/services/server/social/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - ./lemmy ./mastodon ./matrix ./owncast diff --git a/modules/system/services/server/social/lemmy/default.nix b/modules/system/services/server/social/lemmy/default.nix deleted file mode 100644 index 3829818..0000000 --- a/modules/system/services/server/social/lemmy/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, ... }: -{ - imports = [ ./nginx ]; - - services.lemmy = { - enable = config.system.server.enable; - nginx.enable = true; - database.createLocally = true; - settings = { - hostname = "lemmy.${config.domains.p1}"; - email = { - smtp_server = "mx.${config.domains.p1}:587"; - smtp_login = "noreply@${config.domains.p1}"; - smtp_from_address = "NixFox Lemmy "; - smtp_password = config.secrets.noreplyPassword; - tls_type = "starttls"; - }; - }; - }; -} diff --git a/modules/system/services/server/social/lemmy/nginx/default.nix b/modules/system/services/server/social/lemmy/nginx/default.nix deleted file mode 100644 index c083721..0000000 --- a/modules/system/services/server/social/lemmy/nginx/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, ... }: -{ - services.nginx.virtualHosts."lemmy.${config.domains.p1}" = lib.mkIf config.services.lemmy.enable { - enableACME = true; - forceSSL = true; - }; -} diff --git a/modules/system/services/server/social/owncast/nginx/default.nix b/modules/system/services/server/social/owncast/nginx/default.nix index 15ac8fb..7e2db58 100644 --- a/modules/system/services/server/social/owncast/nginx/default.nix +++ b/modules/system/services/server/social/owncast/nginx/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: { - services.nginx.virtualHosts."live.${config.domains.p1}" = lib.mkIf config.services.owncast.enable { + services.nginx.virtualHosts."live.${config.domains.p2}" = lib.mkIf config.services.owncast.enable { enableACME = true; forceSSL = true; locations."/" = {