diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix index 1cbcd89..70933ec 100644 Binary files a/modules/system/secrets/default.nix and b/modules/system/secrets/default.nix differ 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; - }; - }; -}