From 16f158898f988205d26993027fef1750f6ed663a Mon Sep 17 00:00:00 2001 From: Jimbo Date: Sun, 29 Dec 2024 10:06:13 -0500 Subject: [PATCH] Remove pixelfed and photoprism --- modules/system/secrets/default.nix | Bin 1986 -> 1791 bytes .../system/services/server/mysql/default.nix | 7 ---- .../system/services/server/social/default.nix | 5 ++- .../server/social/pixelfed/default.nix | 32 ------------------ 4 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 modules/system/services/server/social/pixelfed/default.nix diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix index 1cbcd891b21536d4e0ab6093f52a8b702ce32d52..70933ecadc21f4a057f835d068833cd8949fdda7 100644 GIT binary patch literal 1791 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 diff --git a/modules/system/services/server/mysql/default.nix b/modules/system/services/server/mysql/default.nix index 1513b2b..ffb208c 100644 --- a/modules/system/services/server/mysql/default.nix +++ b/modules/system/services/server/mysql/default.nix @@ -6,7 +6,6 @@ dataDir = "/var/lib/mysql"; ensureDatabases = [ "minecraft" - "photoprism" ]; ensureUsers = [ { @@ -15,12 +14,6 @@ "minecraft.*" = "ALL PRIVILEGES"; }; } - { - name = "photoprism"; - ensurePermissions = { - "photoprism.*" = "ALL PRIVILEGES"; - }; - } ]; }; } diff --git a/modules/system/services/server/social/default.nix b/modules/system/services/server/social/default.nix index 7177cce..678a2e0 100644 --- a/modules/system/services/server/social/default.nix +++ b/modules/system/services/server/social/default.nix @@ -1,10 +1,9 @@ { ... }: { imports = [ - ./matrix - ./mastodon ./lemmy - ./pixelfed + ./mastodon + ./matrix ./owncast ]; } diff --git a/modules/system/services/server/social/pixelfed/default.nix b/modules/system/services/server/social/pixelfed/default.nix deleted file mode 100644 index d53d371..0000000 --- a/modules/system/services/server/social/pixelfed/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ pkgs, config, ... }: -{ - services.pixelfed = { - enable = true; - domain = "pics.${config.domains.jim1}"; - secretFile = pkgs.writeText "appkey" config.secrets.pixelfedKey; - settings = { - APP_NAME = ''"Jimbo's Pixelfed"''; - INSTANCE_DESCRIPTION = ''"The Jimbosfiles Pixelfed Instance"''; - INSTANCE_CONTACT_EMAIL = "contact@${config.domains.jim2}"; - OPEN_REGISTRATION = true; - APP_LOCALE = "en"; - INSTANCE_DISCOVER_PUBLIC = true; - STORIES_ENABLED = true; - - # Mail config - ENFORCE_EMAIL_VERIFICATION = true; - MAIL_FROM_ADDRESS = "noreply@${config.domains.jim1}"; - MAIL_FROM_NAME = ''"Jimbo's Pixelfed "''; - MAIL_ENCRYPTION = "tls"; - MAIL_DRIVER = "smtp"; - MAIL_HOST = "mx.${config.domains.jim1}"; - MAIL_PORT = 587; - MAIL_USERNAME = "noreply@${config.domains.jim1}"; - MAIL_PASSWORD = config.secrets.noreplyPassword; - }; - nginx = { - enableACME = true; - forceSSL = true; - }; - }; -}