diff --git a/data.nix b/data.nix index b45a783..b6a8ccf 100644 --- a/data.nix +++ b/data.nix @@ -15,8 +15,6 @@ rec { jakstpub = 505; - photoprism = 507; - remote-builder = 508; }; diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix index a057ca0..7005932 100644 --- a/hosts/fwminex/configuration.nix +++ b/hosts/fwminex/configuration.nix @@ -22,7 +22,6 @@ in grafana-oidc.file = ../../secrets/grafana.jakstys.lt/oidc.age; letsencrypt-account-key.file = ../../secrets/letsencrypt/account.key.age; vaultwarden-secrets-env.file = ../../secrets/vaultwarden/secrets.env.age; - photoprism-admin-passwd.file = ../../secrets/photoprism/admin_password.age; synapse-jakstys-signing-key.file = ../../secrets/synapse/jakstys_lt_signing_key.age; synapse-registration-shared-secret.file = ../../secrets/synapse/registration_shared_secret.age; synapse-macaroon-secret-key.file = ../../secrets/synapse/macaroon_secret_key.age; @@ -482,16 +481,6 @@ in subnetCIDR = myData.subnets.tailscale.cidr; }; - photoprism = { - enable = true; - uidgid = myData.uidgid.photoprism; - paths = { - "M-Camera" = "/home/motiejus/annex2/M-Active"; - "Pictures" = "/home/motiejus/annex2/Pictures"; - }; - passwordFile = config.age.secrets.photoprism-admin-passwd.path; - }; - nsd-acme = let accountKey = config.age.secrets.letsencrypt-account-key.path; @@ -530,7 +519,6 @@ in "bitwarden_rs" "matrix-synapse" "private/soju" - "private/photoprism" ]; patterns = [ "- gitea/data/repo-archive/" ]; backup_at = "*-*-* 01:00:01 UTC"; diff --git a/modules/services/default.nix b/modules/services/default.nix index e31087a..90f3491 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -17,7 +17,6 @@ ./node_exporter ./nsd-acme ./ping_exporter - ./photoprism ./postfix ./remote-builder ./ssh8022 diff --git a/modules/services/photoprism/default.nix b/modules/services/photoprism/default.nix deleted file mode 100644 index 972f01c..0000000 --- a/modules/services/photoprism/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.mj.services.photoprism; -in -{ - options.mj.services.photoprism = with lib.types; { - enable = lib.mkEnableOption "enable photoprism"; - uidgid = lib.mkOption { type = int; }; - paths = lib.mkOption { type = attrsOf str; }; - passwordFile = lib.mkOption { type = str; }; - }; - - config = lib.mkIf cfg.enable { - services.photoprism = { - inherit (cfg) passwordFile; - enable = true; - originalsPath = "/var/cache/photoprism/userdata"; - }; - - systemd = { - tmpfiles.rules = [ "d /var/cache/photoprism/userdata 0700 photoprism photoprism -" ]; - services.photoprism.serviceConfig = { - ProtectHome = lib.mkForce "tmpfs"; - CacheDirectory = "photoprism"; - BindPaths = lib.mapAttrsToList ( - name: srcpath: "${srcpath}:/var/cache/photoprism/userdata/${name}" - ) cfg.paths; - }; - }; - - users = { - groups.photoprism.gid = cfg.uidgid; - users.photoprism = { - group = "photoprism"; - uid = cfg.uidgid; - }; - }; - - }; - -} diff --git a/secrets.nix b/secrets.nix index b0af1b9..24b2477 100644 --- a/secrets.nix +++ b/secrets.nix @@ -48,7 +48,6 @@ in "secrets/root_server_passwd_hash.age" "secrets/headscale/oidc_client_secret2.age" - "secrets/photoprism/admin_password.age" "secrets/grafana.jakstys.lt/oidc.age" "secrets/vaultwarden/secrets.env.age" "secrets/letsencrypt/account.key.age" diff --git a/secrets/photoprism/admin_password.age b/secrets/photoprism/admin_password.age deleted file mode 100644 index ee9b789..0000000 Binary files a/secrets/photoprism/admin_password.age and /dev/null differ