From e1c47cb73eceef876e6f5cb361f83582968f9f5b Mon Sep 17 00:00:00 2001 From: chn Date: Fri, 5 Dec 2025 01:34:00 +0800 Subject: [PATCH] modules.services.photoprism: drop --- devices/nas/default.nix | 1 - devices/nas/secrets.yaml | 7 ++--- devices/vps9/default.nix | 2 +- flake/dns/config/chn.moe.nix | 2 +- modules/services/photoprism.nix | 46 --------------------------------- 5 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 modules/services/photoprism.nix diff --git a/devices/nas/default.nix b/devices/nas/default.nix index bd151d10..cd633922 100644 --- a/devices/nas/default.nix +++ b/devices/nas/default.nix @@ -52,7 +52,6 @@ inputs: matrix = { port = 8009; redisPort = 6380; }; }; vaultwarden = {}; - photoprism = {}; nextcloud = {}; freshrss = {}; send = {}; diff --git a/devices/nas/secrets.yaml b/devices/nas/secrets.yaml index 59f3638e..bd2a2b88 100644 --- a/devices/nas/secrets.yaml +++ b/devices/nas/secrets.yaml @@ -53,11 +53,8 @@ vaultwarden: #ENC[AES256_GCM,data:wbKsGwBKrJYagX1AvY0o5FHXxOhrfjZ/+crasAh52uOFYGd0P8A7NnyF6JvNgH749dAT9H47DXRKBAclVVSqWPc=,iv:TZgJ7pwyGBpf7S4g7CL2dync2sGNzQ9369atAvLwFJ8=,tag:sxtkPHOmrjUb13zeWPBdng==,type:comment] admin_token: ENC[AES256_GCM,data:TrgqQwXBoCdsLeWQYkur4zS+Z4nCoDDoePnN5vm+AIcgYXVwjxcf/0AwXQIxVNEypYysPpoHKOigwhkf5kLazAMiBZ0goAflJT/S4nOLo90s+9kDCADXWnCeHNhBUg8fUulNPBbpqdfFKCJgJCD2WTI+V5yFLQ==,iv:maKU6pcxis7Cyrx9x26cUTBzA6ZKcKJWSP23w+MDehw=,tag:GYpPHp2slC6V8aKA1FHFAg==,type:str] mariadb: - photoprism: ENC[AES256_GCM,data:h7TQh5ScGM30e42VSEg6AynwRUPHMRHddJcJotQtDbkFVgmfjHmAHTY22U5jWqjq4KXPN5ItRETLOMw9k9yOgg==,iv:jFTPaXortmiU+8m/NBTYjAXRXHCpD+UE5oeveH7/znk=,tag:3OOUUyHLQJROh5rZcX8bAg==,type:str] freshrss: ENC[AES256_GCM,data:Qjg5GIX13ccZi/DuqtWK0qzr2GK0GzzUdEZWXDhUhGxFWzgosADxDCc8wfOchItaJFefnVrpPxdAPvT+4TEH0g==,iv:oGii3o6sJYVc11kdQMh0Pa3GUbWqttFgjvSVEbTycZc=,tag:8GWWwuJjQBwDFl9pJvg90g==,type:str] huginn: ENC[AES256_GCM,data:/hFQdG/RGrX75qd0+WgwhnwR7p/CEVx1vPksRSudxmc1m4VO/AVzgMCWAz4310ctTEnn4GZinvD6QGFta5IOSA==,iv:mrPDZA6Bnw+SPVDDe64tivvvQtHWvCsPJbEnPqm12g4=,tag:ihXbIJwwtQ0RfaNfcaop4Q==,type:str] -photoprism: - adminPassword: ENC[AES256_GCM,data:QXrDNGSKdRZxc4mfwIhR5cmmmJysGV3cThSFlng3mEviaq0p+BvOa5Thtgw0CxQXdpgjrkui+837NJ/FxPUYvg==,iv:EkutxeDDWfSOVD9p1Ari/rkgf7EwTutDymZQ1uNm6FA=,tag:r3gXuefnIQ+5pPtGZajnZg==,type:str] nextcloud: admin: ENC[AES256_GCM,data:DJK+u19VP9cFvq4/P0+f7erXxZkRWI4NRrX9HdHO96xy9wZMtB+hEDN3zLQnkTTtmd2ZLs9+c9BsUNXZperGDQ==,iv:zX8Nxt5+O/mGVt5l1j8IojBkgxg5oDae6KWTXYz0hRE=,tag:MRyMx0OXYTCmtaySP/umNw==,type:str] freshrss: @@ -93,7 +90,7 @@ sops: by9Rd0U0bzNiK21BQTNxN1RuQ09DQVkKJmSlzV5ppEkZFljsS17ZWmoI++fz4tJh kTdoAStG1zsKASHyZTsmdm3RBDO3qV1KhQC2gC7d4EiwNZngxOOZJg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-12-04T12:33:59Z" - mac: ENC[AES256_GCM,data:PziK49hYICDZX887LZmQhOOtjjijduVZxcimw0P9HecJrixtda2CzG2ZzRK3fmo4qIIWpdopmoNAHkFLV5SmA8W5NCW467fYvETFtChZk/R+7MlzNctCQ3DJKCNIGcPxq+7XuqXcX3Cv6n4tELYs23q9TCkXuEjIRaaL4qYRVq0=,iv:VQdHRmFUUlLOJ+6QRjmhEfYQ6FAcIjgfiCDS63ZjZto=,tag:3Wnkci/4r5xVGZNJ4fXxHw==,type:str] + lastmodified: "2025-12-04T17:33:50Z" + mac: ENC[AES256_GCM,data:MjCnibcdkR927418wAlPUj5IXfbCQMS4QQOKvWRHdqqZHBQFw886Nx8YOXvH2PTgAhDWjzhuhnkF3InaY63zYqamJcKKwp/aIjZ97UXNKsZPKaVo48S9rBuHPFI/NceDSoMPZvgrMhgNguegdc6B8D2fwJPdtdSa6pJez1WQ9r8=,iv:kZnVRglmmWkR7f80bCX9Y5Th3dNI8TtUxx6P40d7E1o=,tag:5L0bfCYJq/EpvaT8BJA2QQ==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0 diff --git a/devices/vps9/default.nix b/devices/vps9/default.nix index ed5c4367..06ecb662 100644 --- a/devices/vps9/default.nix +++ b/devices/vps9/default.nix @@ -31,7 +31,7 @@ inputs: (site: { name = "${site}.chn.moe"; value.upstream.address = "tinc0.nas.chn.moe"; }) [ "xn--s8w913fdga" "matrix" "send" "git" "grafana" "peertube" "rsshub" "misskey" "synapse" "vaultwarden" - "photoprism" "nextcloud" "freshrss" "huginn" "api" "webdav" + "nextcloud" "freshrss" "huginn" "api" "webdav" ]); }; }; diff --git a/flake/dns/config/chn.moe.nix b/flake/dns/config/chn.moe.nix index 0bbcb1a5..8cb08d98 100644 --- a/flake/dns/config/chn.moe.nix +++ b/flake/dns/config/chn.moe.nix @@ -25,7 +25,7 @@ let "initrd.vps9" "xserver2.vps9" # to nas "git" "grafana" "peertube" "send" "vikunja" "xservernas" "freshrss" "huginn" "nextcloud" - "photoprism" "rsshub" "vaultwarden" "webdav" "synapse" "misskey" "api" + "rsshub" "vaultwarden" "webdav" "synapse" "misskey" "api" ]; }; a = diff --git a/modules/services/photoprism.nix b/modules/services/photoprism.nix deleted file mode 100644 index bd9425c9..00000000 --- a/modules/services/photoprism.nix +++ /dev/null @@ -1,46 +0,0 @@ -inputs: -{ - options.nixos.services.photoprism = let inherit (inputs.lib) mkOption types; in mkOption - { type = types.nullOr (types.submodule {}); default = null; }; - config = let inherit (inputs.config.nixos.services) photoprism; in inputs.lib.mkIf (photoprism != null) - { - services.photoprism = - { - enable = true; - originalsPath = inputs.config.services.photoprism.storagePath + "/originals"; - settings = - { - PHOTOPRISM_SITE_URL = "https://photoprism.chn.moe"; - PHOTOPRISM_HTTP_PORT = "2342"; - PHOTOPRISM_DISABLE_TLS = "true"; - PHOTOPRISM_DETECT_NSFW = "true"; - PHOTOPRISM_UPLOAD_NSFW = "true"; - PHOTOPRISM_DATABASE_DRIVER = "mysql"; - PHOTOPRISM_DATABASE_SERVER = "127.0.0.1:3306"; - }; - }; - systemd.services.photoprism = - { - after = [ "mysql.service" ]; - requires = [ "mysql.service" ]; - serviceConfig.EnvironmentFile = inputs.config.nixos.system.sops.templates."photoprism/env".path; - }; - nixos = - { - system.sops = - { - templates."photoprism/env".content = let inherit (inputs.config.nixos.system.sops) placeholder; in - '' - PHOTOPRISM_ADMIN_PASSWORD=${placeholder."photoprism/adminPassword"} - PHOTOPRISM_DATABASE_PASSWORD=${placeholder."mariadb/photoprism"} - ''; - secrets."photoprism/adminPassword" = {}; - }; - services = - { - mariadb.instances.photoprism = {}; - nginx.https."photoprism.chn.moe".location."/".proxy = { upstream = "http://127.0.0.1:2342"; websocket = true; }; - }; - }; - }; -}