From 8149de017b9dc58a6bb059b2966132cc564f200c Mon Sep 17 00:00:00 2001
From: chatton <github.qpeyb@simplelogin.fr>
Date: Thu, 13 Jul 2023 15:19:25 +0100
Subject: [PATCH] use definition for overseerr and upgrade

---
 host_vars/qnap.yml                            |  3 +-
 roles/portainer_overseerr/defaults/main.yml   |  9 +++++
 roles/portainer_overseerr/tasks/main.yml      | 34 +++++++++++++++++++
 .../setup_hosted_services/templates/mealie.j2 | 27 ---------------
 .../templates/overseerr.j2                    | 20 -----------
 5 files changed, 44 insertions(+), 49 deletions(-)
 create mode 100644 roles/portainer_overseerr/defaults/main.yml
 create mode 100644 roles/portainer_overseerr/tasks/main.yml
 delete mode 100644 roles/setup_hosted_services/templates/mealie.j2
 delete mode 100644 roles/setup_hosted_services/templates/overseerr.j2

diff --git a/host_vars/qnap.yml b/host_vars/qnap.yml
index 7a95fca..1d58a77 100644
--- a/host_vars/qnap.yml
+++ b/host_vars/qnap.yml
@@ -77,8 +77,6 @@ services:
     template_vars:
       image: gitea/gitea
       tag: 1.19.0
-  - name: mealie
-  - name: overseerr
   - name: nextcloud
     template_vars:
       default_network: mariadb_net
@@ -119,3 +117,4 @@ portainer_roles:
   - role: portainer_arr
   - role: portainer_gotify
   - role: portainer_pihole
+  - role: portainer_overseerr
diff --git a/roles/portainer_overseerr/defaults/main.yml b/roles/portainer_overseerr/defaults/main.yml
new file mode 100644
index 0000000..39c404c
--- /dev/null
+++ b/roles/portainer_overseerr/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+overseerr_state: present
+overseerr_image: sctx/overseerr
+overseerr_tag: 1.33.0
+overseerr_expose_port: 5055
+overseerr_container_name: overseerr
+overseerr_portainer_stack_name: overseerr
+overseerr_puid: 1000
+overseerr_pgid: 1000
diff --git a/roles/portainer_overseerr/tasks/main.yml b/roles/portainer_overseerr/tasks/main.yml
new file mode 100644
index 0000000..b8869a5
--- /dev/null
+++ b/roles/portainer_overseerr/tasks/main.yml
@@ -0,0 +1,34 @@
+---
+- name: "Overseerr | Restore any missing volumes from S3"
+  ansible.builtin.include_role:
+    name: chatton.docker_backup.docker_s3_volume_restore
+  vars:
+    docker_backup_s3_volume:
+      name: "{{ overseerr_portainer_stack_name }}_config"
+
+- name: "Overseerr | Update Portainer."
+  chatton.portainer.portainer_stack:
+    username: '{{ portainer_user }}'
+    password: '{{ portainer.password }}'
+    base_url: '{{ portainer_base_url }}'
+    stack_name: '{{ overseerr_portainer_stack_name }}'
+    endpoint_id: '{{ portainer_endpoint }}'
+    state: "{{ overseerr_state }}"
+    definition:
+      version: "3.1"
+      services:
+        overseerr:
+          labels: "{{ backup_labels }}"
+          image: "{{ overseerr_image }}:{{ overseerr_tag }}"
+          container_name: "{{ overseerr_container_name }}"
+          environment:
+            - PUID={{ overseerr_puid }}
+            - PGID={{ overseerr_pgid }}
+            - TZ=Europe/London
+          volumes:
+            - config:/app/config
+          ports:
+            - "{{ overseerr_expose_port }}:5055"
+          restart: "{{ restart_policy }}"
+      volumes:
+        config: {}
diff --git a/roles/setup_hosted_services/templates/mealie.j2 b/roles/setup_hosted_services/templates/mealie.j2
deleted file mode 100644
index dc6c4f4..0000000
--- a/roles/setup_hosted_services/templates/mealie.j2
+++ /dev/null
@@ -1,27 +0,0 @@
----
-version: "3.1"
-services:
-  mealie:
-    labels:
-      ie.cianhatton.backup.enabled: "true"
-      ie.cianhatton.backup.schedule: "{{backups.schedule_keys.nightly}}"
-    container_name: mealie
-    image: hkotel/mealie:latest
-    restart: unless-stopped
-    ports:
-      - 9925:80
-    environment:
-      PUID: 1000
-      PGID: 1000
-
-      # Default Recipe Settings
-      RECIPE_PUBLIC: 'true'
-      RECIPE_SHOW_NUTRITION: 'true'
-      RECIPE_SHOW_ASSETS: 'true'
-      RECIPE_LANDSCAPE_VIEW: 'true'
-      RECIPE_DISABLE_COMMENTS: 'false'
-      RECIPE_DISABLE_AMOUNT: 'false'
-    volumes:
-      - data:/app/data
-volumes:
-  data:
diff --git a/roles/setup_hosted_services/templates/overseerr.j2 b/roles/setup_hosted_services/templates/overseerr.j2
deleted file mode 100644
index c5ab5d3..0000000
--- a/roles/setup_hosted_services/templates/overseerr.j2
+++ /dev/null
@@ -1,20 +0,0 @@
----
-version: "3"
-services:
-  overseerr:
-    labels:
-      ie.cianhatton.backup.enabled: "true"
-      ie.cianhatton.backup.schedule: "{{backups.schedule_keys.nightly}}"
-    image: sctx/overseerr:latest
-    container_name: overseerr
-    ports:
-      - 5055:5055
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/London
-    volumes:
-      - "config:/app/config"
-    restart: unless-stopped
-volumes:
-  config: