From cd44a21d73c59b65def203169670b99fb39fcfad Mon Sep 17 00:00:00 2001
From: rfl <rfl@flipdot.org>
Date: Fri, 20 Sep 2024 17:35:44 +0200
Subject: [PATCH] Fix config

Fix typos, url and network
---
 paperless/init.sls | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/paperless/init.sls b/paperless/init.sls
index 27342fc..7d80aa6 100644
--- a/paperless/init.sls
+++ b/paperless/init.sls
@@ -8,6 +8,11 @@ paperless-data-directory-exists:
     - name: /opt/paperless/webserver
     - makedirs: True
 
+docker-network-paperless-exists:
+  docker_network.present:
+    - name: paperless-network
+    - scope: local
+
 broker-docker-container-running:
   docker_container.running:
     - name: broker
@@ -16,10 +21,10 @@ broker-docker-container-running:
     - restart: unless-stopped
     - binds: /opt/paperless/broker:/data
     - networks:
-      - bridge
+      - paperless-network
 
 gotenberg-docker-container-running:
-  docker_container.runnig:
+  docker_container.running:
     - name: gotenberg
     - image: {{ salt['pillar.get']('paperless:gotenberg:image:path', 'docker.io/gotenberg/gotenberg') }}:{{ salt['pillar.get']('paperless:gotenberg:image:version', '8.9.1') }}
     - container_name: gotenberg
@@ -31,16 +36,16 @@ gotenberg-docker-container-running:
       - "--chromium-disable-javascript=true"
       - "--chromium-allow-list=file:///tmp/.*"
     - networks:
-      - bridge
+      - paperless-network
 
 tika-docker-container-running:
-  docker_container.runnig:
+  docker_container.running:
     - name: tika
     - image: {{ salt['pillar.get']('paperless:tika:image:path', 'docker.io/apache/tika') }}:{{ salt['pillar.get']('paperless:tika:image:version', '2.9.2.1') }}
     - container_name: tika
     - restart: unless-stopped
     - networks:
-      - bridge
+      - paperless-network
 
 paperless-docker-container-running:
   docker_container.running:
@@ -48,7 +53,7 @@ paperless-docker-container-running:
     # So we have to set everything through environment variables.
     # see https://github.com/paperless-ngx/paperless-ngx/blob/main/docker/compose/docker-compose.env
     - name: paperless
-    - image: {{ salt['pillar.get']('paperless:webserver:image:path', 'github.com/paperless-ngx/paperless-ngx') }}:{{ salt['pillar.get']('paperless:webserver:image:version', 'v2.11.6') }}
+    - image: {{ salt['pillar.get']('paperless:webserver:image:path', 'ghcr.io/paperless-ngx/paperless-ngx') }}:{{ salt['pillar.get']('paperless:webserver:image:version', '2.12') }}
     - container_name: paperless
     - environment:
       - USER_UID=1000
@@ -64,7 +69,7 @@ paperless-docker-container-running:
       # - PAPERLESS_URL={{ salt['pillar.get']('paperless:webserver:environment:url', 'https://paperless.flipdot.org') }}
     - restart: always
     - networks:
-      - bridge
+      - paperless-network
     - extra_hosts:
       - ldap.flipdot.space:192.168.3.233
     - binds: