From 358b7a00b6e92847ca3c05456e69594fe71722e6 Mon Sep 17 00:00:00 2001
From: chatton <github.qpeyb@simplelogin.fr>
Date: Mon, 5 Jun 2023 12:05:12 +0100
Subject: [PATCH] adding vpn stack to olivetin, removing unused dashy items

---
 .../docker_s3_volume_restore/tasks/main.yml     |  4 ++++
 host_vars/qnap.yml                              |  1 -
 .../files/dashboards/dashy-config.yml           |  7 ++-----
 .../files/olivetin/config.yml                   | 17 ++++++-----------
 .../templates/hasteypaste.j2                    |  4 ++--
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/collections/ansible_collections/chatton/docker_backup/roles/docker_s3_volume_restore/tasks/main.yml b/collections/ansible_collections/chatton/docker_backup/roles/docker_s3_volume_restore/tasks/main.yml
index 0ca269b..48a620d 100644
--- a/collections/ansible_collections/chatton/docker_backup/roles/docker_s3_volume_restore/tasks/main.yml
+++ b/collections/ansible_collections/chatton/docker_backup/roles/docker_s3_volume_restore/tasks/main.yml
@@ -11,6 +11,10 @@
 - name: Determine if backup is needed.
   ansible.builtin.set_fact: should_perform_backup="{{ docker_backup_restore_force or volume_out.changed }}"
 
+- name: Debug var=should_perform_backup
+  ansible.builtin.debug:
+    var: should_perform_backup
+
 # try and find latest volume based on the name.
 - name: Find latest s3 version.
   when:
diff --git a/host_vars/qnap.yml b/host_vars/qnap.yml
index 50e7182..5bf81ad 100644
--- a/host_vars/qnap.yml
+++ b/host_vars/qnap.yml
@@ -55,7 +55,6 @@ services:
       radarr: true
       sonarr: true
       jackett: true
-      tubearchivist: true
   - name: gitea
     template_vars:
       image: gitea/gitea
diff --git a/roles/setup_hosted_services/files/dashboards/dashy-config.yml b/roles/setup_hosted_services/files/dashboards/dashy-config.yml
index c8786a6..b1dcc9c 100644
--- a/roles/setup_hosted_services/files/dashboards/dashy-config.yml
+++ b/roles/setup_hosted_services/files/dashboards/dashy-config.yml
@@ -21,7 +21,7 @@ sections:
         url: http://snunmu:9090
       - title: Nextcloud
         icon: hl-nextcloud
-        url: http://qnap:8081
+        url: https://cloud.cianhatton.ie
       - title: Mealie
         icon: hl-mealie
         url: https://mealie.cianhatton.ie
@@ -95,7 +95,7 @@ sections:
         url: http://qnap:7878
       - title: Overseerr
         icon: hl-overseerr
-        url: http://qnap:5055
+        url: https://overseerr.cianhatton.ie
       - title: Jackett
         icon: hl-jackett
         url: http://qnap:9117
@@ -103,9 +103,6 @@ sections:
       - title: Qbittorrent
         icon: hl-qbittorrent
         url: http://qnap:15000
-      - title: Tube Archivist
-        icon: hl-tubearchivist
-        url: http://qnap:8000
   - name: QNAP
     widgets:
       - type: gl-disk-space
diff --git a/roles/setup_hosted_services/files/olivetin/config.yml b/roles/setup_hosted_services/files/olivetin/config.yml
index 53de481..07e5740 100644
--- a/roles/setup_hosted_services/files/olivetin/config.yml
+++ b/roles/setup_hosted_services/files/olivetin/config.yml
@@ -9,15 +9,10 @@ actions:
     icon: plex
     shell: docker restart plex
     timeout: 30
-  - title: Restart Dashy
-    icon: restart
-    shell: docker restart dashy
-    timeout: 30
-  - title: Restart Dashy 2
-    icon: restart
-    shell: docker restart dashy
-    timeout: 30
-  - title: Restart Olivetin
-    icon: restart
-    shell: docker restart olivetin
+  - title: Restart Overseerr
+    icon: overseerr
+    shell: docker restart plex
     timeout: 30
+  - title: Restart VPN Stack
+    shell: docker restart surfshark sonarr radarr jackett qbittorrent
+    timeout: 90
diff --git a/roles/setup_hosted_services/templates/hasteypaste.j2 b/roles/setup_hosted_services/templates/hasteypaste.j2
index e7fec52..c919f31 100644
--- a/roles/setup_hosted_services/templates/hasteypaste.j2
+++ b/roles/setup_hosted_services/templates/hasteypaste.j2
@@ -13,7 +13,7 @@ services:
     ports:
       - 8000:8000
     environment:
-      - "DEFAULT_USE_LONG_ID=false"
-      - "ENABLE_PUBLIC_LIST=true"
+      - "DEFAULT_USE_LONG_ID=true"
+      - "ENABLE_PUBLIC_LIST=false"
 volumes:
   data: