From 96e8940b08415bbba03c283a81f710122d6692dd Mon Sep 17 00:00:00 2001
From: drew <drew@doctor-ew.com>
Date: Fri, 5 Jul 2024 18:41:22 +0000
Subject: [PATCH] lowered nextcloud probe timeouts

---
 projects/nextcloud/argocd.yaml | 11 +++++++----
 projects/nextcloud/install.sh  | 16 +++++++++++-----
 projects/nextcloud/values.yaml |  6 +++---
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/projects/nextcloud/argocd.yaml b/projects/nextcloud/argocd.yaml
index 38385c7..5afd19f 100644
--- a/projects/nextcloud/argocd.yaml
+++ b/projects/nextcloud/argocd.yaml
@@ -4,6 +4,13 @@ metadata:
   name: nextcloud
 spec:
   project: default
+  source:
+    repoURL: 'https://nextcloud.github.io/helm/'
+    targetRevision: "*"
+    helm:
+      valueFiles:
+      - $values/projects/nextcloud/values.yaml
+    chart: nextcloud
   sources:
   - repoURL: 'https://nextcloud.github.io/helm/'
     helm:
@@ -24,7 +31,3 @@ spec:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
       - Validate=false
-  # sources:
-  # - repoURL: 'https://github.com/v1nsai/homelab.git'
-  #   ref: values
-  #   target: projects/nextcloud/values.yaml
\ No newline at end of file
diff --git a/projects/nextcloud/install.sh b/projects/nextcloud/install.sh
index ec0b55b..9d2a983 100755
--- a/projects/nextcloud/install.sh
+++ b/projects/nextcloud/install.sh
@@ -5,6 +5,12 @@ set -e
 echo "Generating or retrieving credentials..."
 source projects/nextcloud/secrets.env
 
+# if NC_HOST is not defined, prompt for it
+if [ -z "$NC_HOST" ]; then
+    read -sn1 -p "Enter Nextcloud host: " NC_HOST
+    cat "NC_HOST=$NC_HOST" >> projects/nextcloud/secrets.env
+fi
+
 read -sn1 -p "Delete namespace first? (y/N) " DELETE
 if [ "$DELETE" == "y" ]; then
     helm delete -n nextcloud nextcloud --wait || true
@@ -24,11 +30,11 @@ else
         --from-literal=nextcloud-password=$NC_PASSWORD \
         --from-literal=nextcloud-host=$NC_HOST \
         --from-literal=nextcloud-username=admin \
-        --from-literal=nextcloud-token=$NC_PASSWORD \
-        --from-literal=smtp-password=$SMTP_PASS \
-        --from-literal=smtp-host=$SMTP_HOST \
-        --from-literal=smtp-port=$SMTP_PORT \
-        --from-literal=smtp-username=$SMTP_USER
+        --from-literal=nextcloud-token=$NC_PASSWORD
+        # --from-literal=smtp-password=$SMTP_PASS \
+        # --from-literal=smtp-host=$SMTP_HOST \
+        # --from-literal=smtp-port=$SMTP_PORT \
+        # --from-literal=smtp-username=$SMTP_USER
 fi
 
 echo "Generating mariadb passwords..."
diff --git a/projects/nextcloud/values.yaml b/projects/nextcloud/values.yaml
index 507b21d..843bf84 100644
--- a/projects/nextcloud/values.yaml
+++ b/projects/nextcloud/values.yaml
@@ -42,8 +42,8 @@ redis:
 service:
   type: LoadBalancer
 livenessProbe:
-  initialDelaySeconds: 7200
+  initialDelaySeconds: 1800
 readinessProbe:
-  initialDelaySeconds: 7200
+  initialDelaySeconds: 1800
 startupProbe:
-  initialDelaySeconds: 7200
+  initialDelaySeconds: 1800