From ced1758974fbbc41cf5758c2468d9a82d561142b Mon Sep 17 00:00:00 2001 From: titver968 Date: Fri, 17 Oct 2025 08:33:35 +0200 Subject: [PATCH] nextcloud reconfigured --- argocd/apps/nextcloud/.nextcloud.bak.swp | Bin 0 -> 16384 bytes argocd/apps/nextcloud/nextcloud.bak | 128 +++++++++++++++ argocd/apps/nextcloud/nextcloud.yaml | 195 +++++++++++------------ 3 files changed, 221 insertions(+), 102 deletions(-) create mode 100644 argocd/apps/nextcloud/.nextcloud.bak.swp create mode 100644 argocd/apps/nextcloud/nextcloud.bak diff --git a/argocd/apps/nextcloud/.nextcloud.bak.swp b/argocd/apps/nextcloud/.nextcloud.bak.swp new file mode 100644 index 0000000000000000000000000000000000000000..eca0ecb9baa28ec7f4f0fd45a04d21a08a737152 GIT binary patch literal 16384 zcmeI3O^6)F6~{}m9XU#z4;unLI4)@oYmB>RcP;s2a7b1=3R>)ymX)P|y<%O{T{Baf zp6+&4^+=Q0$}KtMkU(+>hQxscLN37x7>vnHkX-De4;I9R7&`}pL70%6?SJ*RRz0KD zY7fR#!;c2f;^QC*-f-7l4B&!5p{)e1z{2 z{smqJ7r+*H0Nf7VI!MTC;AL8x(t zlA9@^Ynkk_wH5agDfGnj0rUwsmSQXd-sgTpWwMrNFFod%ZnnFMh!J{blkHtwyhf8b zx*W&L>#MXQ!Vb+lI7RJxqMt~nMHFH-D378yFCCp#n-LR%t42C@<4Ed;;)_o#xr>iJ z?jCU$cWP-6sU}P2yQy&+ri0I?oKSEd>euPul5F+zOV&-5?i}z$S zTK0X(m1?lj+|4{0h3BKL%R|-;8v9Lixfm4_O7qa;ZaFb^m}a+RX=)S!*UEu2If*Ob zi-}Q$eN$(bL4KXeuUwBy?TlE6{wg(MbhJ^wM2#5)Un0?y;MqI)(XC(!Hq!5B)e2p>B%0xwpiqrx~s<1mDkocMABXEtgW8hT3T2-a_D-Q%c*{roMtSf zBkbl!MP+}=BX*#5tgeqM9>gnw;GsTYuK!S6MCXchJkJF+KdI#rrUu0gF{JZdOtUIg7< zz{XM2qqJ71(P9XnHtwMRKOONz7EtJpMhCIwJQ#E;9+eQ?XeP&+{dd)FdHt zkn$GX#Dm@m&Vt$>vHE~DX3hO9w=$;U2zyTXMnY{B)1*#3OjiZl^l-JaaG01vlm@KJ z1J%wJC$oiCzYKJ(Onl1y!~~yzMZy*J6+rD8coVL=V-crM?2}(89i-I znu?H~EdKko*%HY%{mMe+k7~8xCof%}eU}2c=^kPhN4itUN3ouCL{m0@Q`?d?lh@R0 zS8+k|S#jOO-eM6JEM61V96fF}Q)zyk_AdWJrrS@YpyiLM25J8ZM7NdgsohZK9c|TC HyQrT78-oRU literal 0 HcmV?d00001 diff --git a/argocd/apps/nextcloud/nextcloud.bak b/argocd/apps/nextcloud/nextcloud.bak new file mode 100644 index 0000000..2a78e40 --- /dev/null +++ b/argocd/apps/nextcloud/nextcloud.bak @@ -0,0 +1,128 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: nextcloud + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: 'https://nextcloud.github.io/helm/' + targetRevision: 8.*.* + helm: + parameters: + - name: image.repository + value: 'nextcloud' + - name: image.flavor + value: 'fpm' + - name: ingress.className + value: 'traefik' + - name: nginx.enabled + value: 'true' + - name: 'ingress.enabled' + value: 'true' + - name: ingress.servicePort + value: 'https' + - name: phpClientHttpsFix.enabled + value: 'true' + - name: phpClientHttpsFix.protocol + value: 'https' + - name: nextcloud.host + value: 'innocloud.innovation-hub-niedersachsen.de' + - name: nextcloud.password + value: 'InnoHubADMIN_2024!' + - name: internalDatabase.enabled + value: 'false' + - name: redis.enabled + value: 'true' + - name: redis.auth.password + value: 'redisInnoDBUser' + - name: postgresql.enabled + value: 'true' + - name: postgresql.global.postgresql.auth.password + value: 'pgInnoDBUser' + - name: postgresql.primary.persistence.enabled + value: 'true' + - name: 'endpoint' + value: 'innocloud.innovation-hub-niedersachsen.de' + - name: ingress.hosts[0] + value: 'innocloud.innovation-hub-niedersachsen.de' + - name: 'ingress.tls[0].hosts[0]' + value: 'innocloud.innovation-hub-niedersachsen.de' + - name: 'ingress.tls[0].secretName' + value: innocloud-tls + - name: ingress.annotations.kubernetes\.io\/ingress\.class + value: traefik + - name: ingress.annotations.traefik\.ingress\.kubernetes\.io\/router\.tls + value: 'true' + forceString: true + - name: ingress.annotations.traefik\.ingress\.kubernetes\.io\/router\.middlewares + value: 'kube-system-hsts@kubernetescrd' + - name: service\.annotations\.traefik\.ingress\.kubernetes\.io\/service\.sticky\.cookie + value: 'true' + - name: ingress.annotations.cert-manager\.io\/cluster-issuer + value: lets-encrypt + - name: persistence.enabled + value: 'true' + - name: persistence.nextcloudData.enabled + value: 'true' + - name: cronjob.enabled + value: 'true' + - name: nextcloud.mail.fromAddress + value: 'admin' + - name: nextcloud.mail.domain + value: 'innovation-hub-niedersachsen.de' + - name: nextcloud.mail.smtp.host + value: '192.168.4.125' + - name: nextcloud.mail.smtp.port + value: '25' + + # AppAPI DinD Sidecar Configuration + - name: nextcloud.extraSidecarContainers[0].name + value: 'dind' + - name: nextcloud.extraSidecarContainers[0].image + value: 'docker:27-dind' + - name: nextcloud.extraSidecarContainers[0].securityContext.privileged + value: 'true' + - name: nextcloud.extraSidecarContainers[0].env[0].name + value: 'DOCKER_TLS_CERTDIR' + - name: nextcloud.extraSidecarContainers[0].env[0].value + value: '' + - name: nextcloud.extraSidecarContainers[0].volumeMounts[0].name + value: 'docker-sock' + - name: nextcloud.extraSidecarContainers[0].volumeMounts[0].mountPath + value: '/var/run' + - name: nextcloud.extraSidecarContainers[0].volumeMounts[1].name + value: 'dind-storage' + - name: nextcloud.extraSidecarContainers[0].volumeMounts[1].mountPath + value: '/var/lib/docker' + + # Extra Volumes für DinD + - name: nextcloud.extraVolumes[0].name + value: 'docker-sock' + - name: nextcloud.extraVolumes[0].emptyDir + value: '{}' + - name: nextcloud.extraVolumes[1].name + value: 'dind-storage' + - name: nextcloud.extraVolumes[1].emptyDir + value: '{}' + + # Mount Docker Socket in Nextcloud Container + - name: nextcloud.extraVolumeMounts[0].name + value: 'docker-sock' + - name: nextcloud.extraVolumeMounts[0].mountPath + value: '/var/run' + + chart: nextcloud + destination: + server: 'https://kubernetes.default.svc' + namespace: nextcloud + syncPolicy: + managedNamespaceMetadata: + labels: + pod-security.kubernetes.io/enforce: "privileged" + automated: + selfHeal: true + prune: true + syncOptions: + - CreateNamespace=true diff --git a/argocd/apps/nextcloud/nextcloud.yaml b/argocd/apps/nextcloud/nextcloud.yaml index 2a78e40..5c4e298 100644 --- a/argocd/apps/nextcloud/nextcloud.yaml +++ b/argocd/apps/nextcloud/nextcloud.yaml @@ -10,119 +10,110 @@ spec: repoURL: 'https://nextcloud.github.io/helm/' targetRevision: 8.*.* helm: - parameters: - - name: image.repository - value: 'nextcloud' - - name: image.flavor - value: 'fpm' - - name: ingress.className - value: 'traefik' - - name: nginx.enabled - value: 'true' - - name: 'ingress.enabled' - value: 'true' - - name: ingress.servicePort - value: 'https' - - name: phpClientHttpsFix.enabled - value: 'true' - - name: phpClientHttpsFix.protocol - value: 'https' - - name: nextcloud.host - value: 'innocloud.innovation-hub-niedersachsen.de' - - name: nextcloud.password - value: 'InnoHubADMIN_2024!' - - name: internalDatabase.enabled - value: 'false' - - name: redis.enabled - value: 'true' - - name: redis.auth.password - value: 'redisInnoDBUser' - - name: postgresql.enabled - value: 'true' - - name: postgresql.global.postgresql.auth.password - value: 'pgInnoDBUser' - - name: postgresql.primary.persistence.enabled - value: 'true' - - name: 'endpoint' - value: 'innocloud.innovation-hub-niedersachsen.de' - - name: ingress.hosts[0] - value: 'innocloud.innovation-hub-niedersachsen.de' - - name: 'ingress.tls[0].hosts[0]' - value: 'innocloud.innovation-hub-niedersachsen.de' - - name: 'ingress.tls[0].secretName' - value: innocloud-tls - - name: ingress.annotations.kubernetes\.io\/ingress\.class - value: traefik - - name: ingress.annotations.traefik\.ingress\.kubernetes\.io\/router\.tls - value: 'true' - forceString: true - - name: ingress.annotations.traefik\.ingress\.kubernetes\.io\/router\.middlewares - value: 'kube-system-hsts@kubernetescrd' - - name: service\.annotations\.traefik\.ingress\.kubernetes\.io\/service\.sticky\.cookie - value: 'true' - - name: ingress.annotations.cert-manager\.io\/cluster-issuer - value: lets-encrypt - - name: persistence.enabled - value: 'true' - - name: persistence.nextcloudData.enabled - value: 'true' - - name: cronjob.enabled - value: 'true' - - name: nextcloud.mail.fromAddress - value: 'admin' - - name: nextcloud.mail.domain - value: 'innovation-hub-niedersachsen.de' - - name: nextcloud.mail.smtp.host - value: '192.168.4.125' - - name: nextcloud.mail.smtp.port - value: '25' - - # AppAPI DinD Sidecar Configuration - - name: nextcloud.extraSidecarContainers[0].name - value: 'dind' - - name: nextcloud.extraSidecarContainers[0].image - value: 'docker:27-dind' - - name: nextcloud.extraSidecarContainers[0].securityContext.privileged - value: 'true' - - name: nextcloud.extraSidecarContainers[0].env[0].name - value: 'DOCKER_TLS_CERTDIR' - - name: nextcloud.extraSidecarContainers[0].env[0].value - value: '' - - name: nextcloud.extraSidecarContainers[0].volumeMounts[0].name - value: 'docker-sock' - - name: nextcloud.extraSidecarContainers[0].volumeMounts[0].mountPath - value: '/var/run' - - name: nextcloud.extraSidecarContainers[0].volumeMounts[1].name - value: 'dind-storage' - - name: nextcloud.extraSidecarContainers[0].volumeMounts[1].mountPath - value: '/var/lib/docker' + values: | + image: + repository: nextcloud + flavor: fpm - # Extra Volumes für DinD - - name: nextcloud.extraVolumes[0].name - value: 'docker-sock' - - name: nextcloud.extraVolumes[0].emptyDir - value: '{}' - - name: nextcloud.extraVolumes[1].name - value: 'dind-storage' - - name: nextcloud.extraVolumes[1].emptyDir - value: '{}' + ingress: + enabled: true + className: traefik + servicePort: https + annotations: + kubernetes.io/ingress.class: traefik + traefik.ingress.kubernetes.io/router.tls: "true" + traefik.ingress.kubernetes.io/router.middlewares: kube-system-hsts@kubernetescrd + cert-manager.io/cluster-issuer: lets-encrypt + hosts: + - innocloud.innovation-hub-niedersachsen.de + tls: + - secretName: innocloud-tls + hosts: + - innocloud.innovation-hub-niedersachsen.de - # Mount Docker Socket in Nextcloud Container - - name: nextcloud.extraVolumeMounts[0].name - value: 'docker-sock' - - name: nextcloud.extraVolumeMounts[0].mountPath - value: '/var/run' + service: + annotations: + traefik.ingress.kubernetes.io/service.sticky.cookie: "true" + + nginx: + enabled: true + + phpClientHttpsFix: + enabled: true + protocol: https + + nextcloud: + host: innocloud.innovation-hub-niedersachsen.de + password: InnoHubADMIN_2024! + mail: + enabled: true + fromAddress: admin + domain: innovation-hub-niedersachsen.de + smtp: + host: 192.168.4.125 + port: 25 + # DinD Sidecar für AppAPI + extraSidecarContainers: + - name: dind + image: docker:27-dind + securityContext: + privileged: true + env: + - name: DOCKER_TLS_CERTDIR + value: "" + volumeMounts: + - name: docker-sock + mountPath: /var/run + - name: dind-storage + mountPath: /var/lib/docker + + extraVolumes: + - name: docker-sock + emptyDir: {} + - name: dind-storage + emptyDir: {} + + extraVolumeMounts: + - name: docker-sock + mountPath: /var/run + + internalDatabase: + enabled: false + + redis: + enabled: true + auth: + password: redisInnoDBUser + + postgresql: + enabled: true + global: + postgresql: + auth: + password: pgInnoDBUser + primary: + persistence: + enabled: true + + persistence: + enabled: true + nextcloudData: + enabled: true + + cronjob: + enabled: true + chart: nextcloud destination: server: 'https://kubernetes.default.svc' namespace: nextcloud syncPolicy: managedNamespaceMetadata: - labels: + labels: pod-security.kubernetes.io/enforce: "privileged" automated: selfHeal: true prune: true syncOptions: - - CreateNamespace=true + - CreateNamespace=true \ No newline at end of file