From 88f2c1e49fbb963eaecb8b85b0d3e5c7e97e2c48 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Wed, 29 Mar 2023 09:45:04 +0200
Subject: [PATCH] Try official image

---
 customers/base/nextcloud-configmap.yml        | 31 -------------------
 customers/base/nextcloud-deployment.yml       |  9 +++---
 customers/base/nextcloud-ingress.yml          |  2 +-
 customers/base/nextcloud-service.yml          |  4 +--
 .../overlays/vr/test/nextcloud-ingress.yml    |  2 +-
 5 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/customers/base/nextcloud-configmap.yml b/customers/base/nextcloud-configmap.yml
index e3d72bb..e148c64 100644
--- a/customers/base/nextcloud-configmap.yml
+++ b/customers/base/nextcloud-configmap.yml
@@ -3,37 +3,6 @@ kind: ConfigMap
 metadata:
   name: nextcloud-configmap
 data:
-  000-default.conf: |
-    LoadModule remoteip_module /usr/lib/apache2/modules/mod_remoteip.so
-    Listen 8080
-    <VirtualHost *:8080>
-        ServerAdmin webmaster@localhost
-        DocumentRoot /var/www/html
-        # Log format config
-        LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" common
-        SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
-
-        # Header config
-        RemoteIPHeader X-Forwarded-For
-        RemoteIPInternalProxy 37.156.195.11
-        RemoteIPInternalProxy 37.156.195.12
-        RemoteIPInternalProxy 37.156.195.21
-        RemoteIPInternalProxy 37.156.195.22
-        # TODO: Package 404 for k8s
-        # ErrorDocument 404 /404.html
-        ErrorLog /dev/stderr
-        TransferLog /dev/stdout
-        <Directory /var/www/html/>
-            LimitRequestBody 0
-            Require all granted
-            AllowOverride All
-            Options FollowSymLinks MultiViews
-
-            <IfModule mod_dav.c>
-                Dav off
-            </IfModule>
-        </Directory>
-    </VirtualHost>
   config.php: |
     <?php
     $CONFIG = array (
diff --git a/customers/base/nextcloud-deployment.yml b/customers/base/nextcloud-deployment.yml
index d07318a..a68ece9 100644
--- a/customers/base/nextcloud-deployment.yml
+++ b/customers/base/nextcloud-deployment.yml
@@ -29,7 +29,8 @@ spec:
       restartPolicy: Always
       containers:
         - name: customer
-          image: docker.sunet.se/drive/nextcloud-custom:25.0.3.3-4
+          #image: docker.sunet.se/drive/nextcloud-custom:25.0.3.3-4
+          image: nextcloud:latest
           volumeMounts:
             - name: nextcloud-data
               mountPath: /var/www/html/config
@@ -46,16 +47,16 @@ spec:
               memory: 256Mi
           readinessProbe:
               tcpSocket:
-                port: 8080
+                port: 80
               initialDelaySeconds: 180
               periodSeconds: 60
           livenessProbe:
               tcpSocket:
-                port: 8080
+                port: 80
               initialDelaySeconds: 300
               periodSeconds: 180
           ports:
-            - containerPort: 8080
+            - containerPort: 80
               name: nextcloud-http
           command: ['/bin/sh', '-c', '/etc/init.d/apache2 start']
       initContainers:
diff --git a/customers/base/nextcloud-ingress.yml b/customers/base/nextcloud-ingress.yml
index 0fd50d0..fb2548f 100644
--- a/customers/base/nextcloud-ingress.yml
+++ b/customers/base/nextcloud-ingress.yml
@@ -28,4 +28,4 @@ spec:
           service:
             name: customer-node
             port:
-              number: 8080
+              number: 80
diff --git a/customers/base/nextcloud-service.yml b/customers/base/nextcloud-service.yml
index ab22957..29d7fdd 100644
--- a/customers/base/nextcloud-service.yml
+++ b/customers/base/nextcloud-service.yml
@@ -9,9 +9,9 @@ items:
     name: customer-node
   spec:
     ports:
-    - port: 8080
+    - port: 80
       protocol: TCP
-      targetPort: 8080
+      targetPort: 80
     selector:
       app: customer-node
     sessionAffinity: None
diff --git a/customers/overlays/vr/test/nextcloud-ingress.yml b/customers/overlays/vr/test/nextcloud-ingress.yml
index 0cbf4f5..9bec27e 100644
--- a/customers/overlays/vr/test/nextcloud-ingress.yml
+++ b/customers/overlays/vr/test/nextcloud-ingress.yml
@@ -23,4 +23,4 @@ spec:
           service:
             name: customer-node
             port:
-              number: 8080
+              number: 80