From b75f8fce7b4e6bd2dd009509a07ff94b81fe2ece Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Fri, 7 Jul 2023 15:52:12 -0700
Subject: [PATCH] Clean photoprism config

---
 services/main.tf | 57 +++++++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/services/main.tf b/services/main.tf
index 74ceb30..2e2167f 100644
--- a/services/main.tf
+++ b/services/main.tf
@@ -70,20 +70,50 @@ module "photoprism_module" {
   name               = "photoprism"
   image              = "photoprism/photoprism:221118-jammy"
   image_pull_timeout = "10m"
-  ingress            = true
-  service_port       = 2342
-  sticky_disk        = true
   constraints = [{
     attribute = "$${meta.hw_transcode.type}"
     # operator = "is_set"
     value = "raspberry"
   }]
+
   docker_devices = [{
     host_path      = "$${meta.hw_transcode.device}"
     container_path = "$${meta.hw_transcode.device}"
   }]
+  resources = {
+    cpu        = 2000
+    memory     = 3000
+    memory_max = 4000
+  }
+  sticky_disk = true
+  host_volumes = [
+    {
+      name      = "photoprism-storage"
+      dest      = "/photoprism-storage"
+      read_only = false
+    },
+    {
+      name      = "photoprism-media"
+      dest      = "/photoprism-media"
+      read_only = false
+    },
+  ]
+
+
+  ingress      = true
+  service_port = 2342
+  service_tags = [
+    "traefik.http.routers.photoprism.middlewares=authelia@nomad",
+  ]
+
+  mysql_bootstrap = {
+    enabled = true
+  }
+
   env = {
     PHOTOPRISM_DEBUG = true
+    # Make public since we added Authelia at the proxy level
+    PHOTOPRISM_AUTH_MODE = "public"
     # UI
     PHOTOPRISM_SITE_CAPTION     = "AI-Powered Photos App"
     PHOTOPRISM_SITE_DESCRIPTION = "Fijolek home photos"
@@ -101,26 +131,7 @@ module "photoprism_module" {
     PHOTOPRISM_GID   = 100
     PHOTOPRISM_UMASK = 0000
   }
-  resources = {
-    cpu        = 2000
-    memory     = 3000
-    memory_max = 4000
-  }
-  host_volumes = [
-    {
-      name      = "photoprism-storage"
-      dest      = "/photoprism-storage"
-      read_only = false
-    },
-    {
-      name      = "photoprism-media"
-      dest      = "/photoprism-media"
-      read_only = false
-    },
-  ]
-  mysql_bootstrap = {
-    vault_key = "nomad/jobs/photoprism"
-  }
+
   templates = [
     {
       data        = <<EOF