From f7ee670da62e851f46a48c27c0b5af52a524c5a1 Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Fri, 24 Mar 2023 20:07:52 -0400
Subject: [PATCH] Setup Nextcloud again

---
 ansible-5/roles/prod.k3s/defaults/main.yml     | 10 ++++------
 .../roles/prod.k3s/files/nextcloud/values.yaml | 11 ++++++-----
 .../prod.k3s/tasks/deployments/nextcloud.yaml  | 18 +++++++++---------
 .../prod.k3s/templates/nextcloud/pv-apps.yaml  |  3 ++-
 .../templates/nextcloud/pv-configs.yaml        |  3 ++-
 .../prod.k3s/templates/nextcloud/pv-data.yaml  |  3 ++-
 .../prod.k3s/templates/nextcloud/pv-main.yaml  |  3 ++-
 7 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/ansible-5/roles/prod.k3s/defaults/main.yml b/ansible-5/roles/prod.k3s/defaults/main.yml
index 23a8370..d491614 100644
--- a/ansible-5/roles/prod.k3s/defaults/main.yml
+++ b/ansible-5/roles/prod.k3s/defaults/main.yml
@@ -81,22 +81,20 @@ apps:
     state: present
 
   nextcloud:
-    enabled: false
+    enabled: true
     namespace: nextcloud
-    state: present
-
 
   hello_world:
-    enabled: true
+    enabled: false
     namespace: default
     state: present
 
   funkwhale:
-    enabled: true
+    enabled: false
     namespace: funkwhale
     state: present
 
   redis:
-    enabled: true
+    enabled: false
     namespace: redis
     state: present
diff --git a/ansible-5/roles/prod.k3s/files/nextcloud/values.yaml b/ansible-5/roles/prod.k3s/files/nextcloud/values.yaml
index 295fcde..c9e8c41 100644
--- a/ansible-5/roles/prod.k3s/files/nextcloud/values.yaml
+++ b/ansible-5/roles/prod.k3s/files/nextcloud/values.yaml
@@ -152,17 +152,17 @@ nextcloud:
 
 persistence:
   enabled: true
-#  existingClaim: nextcloud-main-0
-  nextcloudData:
-    enabled: true
-    existingClaim: nextcloud-data-0
+  existingClaim: nextcloud-main-0
+#  nextcloudData:
+#    enabled: true
+#    existingClaim: nextcloud-data-0
 
 readinessProbe:
   initialDelaySeconds: 30
 
 startupProbe:
   enabled: true
-  initialDelaySeconds: 60
+  initialDelaySeconds: 90
 
 internalDatabase:
   enabled: false
@@ -176,6 +176,7 @@ externalDatabase:
 
 redis:
   enabled: true
+  architecture: standalone
 
 cronjob:
   enabled: true
diff --git a/ansible-5/roles/prod.k3s/tasks/deployments/nextcloud.yaml b/ansible-5/roles/prod.k3s/tasks/deployments/nextcloud.yaml
index 8f97623..83c4f27 100644
--- a/ansible-5/roles/prod.k3s/tasks/deployments/nextcloud.yaml
+++ b/ansible-5/roles/prod.k3s/tasks/deployments/nextcloud.yaml
@@ -8,23 +8,23 @@
     name: "{{apps.nextcloud.namespace}}"
     api_version: v1
     kind: Namespace
-    state: "{{apps.nextcloud.state}}"
+    state: "{{present}}"
   become: true
 
 
 - name: create persistent volume resources
   kubernetes.core.k8s:
     kubeconfig: "/etc/rancher/k3s/k3s.yaml"
-    state: "{{apps.nextcloud.state}}"
+    state: "present"
     definition: "{{ lookup('template', item) | from_yaml }}"
   loop:
-    - nextcloud/pv-apps.yaml
-    - nextcloud/pv-data.yaml
-    - nextcloud/pv-configs.yaml
+#    - nextcloud/pv-apps.yaml
+#    - nextcloud/pv-data.yaml
+#    - nextcloud/pv-configs.yaml
     - nextcloud/pv-main.yaml
-    - nextcloud/pv-apps-claim.yaml
-    - nextcloud/pv-data-claim.yaml
-    - nextcloud/pv-configs-claim.yaml
+#    - nextcloud/pv-apps-claim.yaml
+#    - nextcloud/pv-data-claim.yaml
+#    - nextcloud/pv-configs-claim.yaml
     - nextcloud/pv-main-claim.yaml
   become: true
 
@@ -44,7 +44,7 @@
     - name: Install Nextcloud Release
       local_action:
         module: kubernetes.core.helm
-        release_state: "{{apps.nextcloud.state}}"
+        release_state: "present"
         name: nextcloud
         namespace: "{{apps.nextcloud.namespace}}"
         create_namespace: yes
diff --git a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-apps.yaml b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-apps.yaml
index 6fdec26..2b672d8 100644
--- a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-apps.yaml
+++ b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-apps.yaml
@@ -13,5 +13,6 @@ spec:
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/opt/data/nextcloud2/apps"
+    path: "/opt/data/T2/nextcloud/apps"
+#    path: "/opt/data/nextcloud2/apps"
 
diff --git a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-configs.yaml b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-configs.yaml
index 8616bae..9b92ba3 100644
--- a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-configs.yaml
+++ b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-configs.yaml
@@ -13,5 +13,6 @@ spec:
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/opt/data/nextcloud2/config"
+    path: "/opt/data/T2/nextcloud/config"
+#    path: "/opt/data/nextcloud2/config"
 
diff --git a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-data.yaml b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-data.yaml
index c5f1bd9..9566abc 100644
--- a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-data.yaml
+++ b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-data.yaml
@@ -13,5 +13,6 @@ spec:
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/opt/data/nextcloud/2022/data"
+    path: "/opt/data/T2/nextcloud/data"
+#    path: "/opt/data/nextcloud/2022/data"
 
diff --git a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-main.yaml b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-main.yaml
index c55b4f8..955bb37 100644
--- a/ansible-5/roles/prod.k3s/templates/nextcloud/pv-main.yaml
+++ b/ansible-5/roles/prod.k3s/templates/nextcloud/pv-main.yaml
@@ -13,5 +13,6 @@ spec:
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/opt/data/nextcloud2/main"
+    path: "/opt/data/T2/nextcloud/main"
+#    path: "/opt/data/nextcloud2/main"