diff --git a/projects/nextcloud/install.sh b/projects/nextcloud/install.sh index 9d2a983..21f4243 100755 --- a/projects/nextcloud/install.sh +++ b/projects/nextcloud/install.sh @@ -5,10 +5,10 @@ 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 + export NC_HOST="$NC_HOST" fi read -sn1 -p "Delete namespace first? (y/N) " DELETE @@ -31,10 +31,6 @@ else --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 fi echo "Generating mariadb passwords..." @@ -78,20 +74,7 @@ else fi rm -rf /tmp/nextcloud.key /tmp/nextcloud.crt -# echo "Creating data pvc..." -# if kubectl get pvc -n nextcloud | grep -q nextcloud-data; then -# echo "PVC nextcloud-data already exists" -# else -# echo "Creating nextcloud-data..." -# kubectl apply -f projects/nextcloud/nextcloud-data.yaml -n nextcloud -# fi - -# echo "Installing Nextcloud..." -# helm repo add nextcloud https://nextcloud.github.io/helm/ -# helm repo update -# helm upgrade --install nextcloud nextcloud/nextcloud \ -# --namespace nextcloud \ -# --create-namespace \ -# --values projects/nextcloud/values.yaml \ -# --set nextcloud.host=$NC_HOST - +echo "Installing Nextcloud..." +argocd app create --upsert nextcloud \ + --file projects/nextcloud/argocd.yaml \ + --helm-set "nextcloud.host=$NC_HOST" diff --git a/projects/nextcloud/nextcloud-data.yaml b/projects/nextcloud/nextcloud-data.yaml deleted file mode 100644 index aaacfba..0000000 --- a/projects/nextcloud/nextcloud-data.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: nextcloud-data -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 10Gi \ No newline at end of file diff --git a/projects/nextcloud/values.yaml b/projects/nextcloud/values.yaml index 843bf84..9d3dc98 100644 --- a/projects/nextcloud/values.yaml +++ b/projects/nextcloud/values.yaml @@ -42,8 +42,8 @@ redis: service: type: LoadBalancer livenessProbe: - initialDelaySeconds: 1800 + initialDelaySeconds: 900 readinessProbe: - initialDelaySeconds: 1800 + initialDelaySeconds: 900 startupProbe: - initialDelaySeconds: 1800 + initialDelaySeconds: 900