From 20e5a049510a81c0cc70302e1b9c6cc4396023b8 Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Wed, 29 Mar 2023 17:02:25 +0200
Subject: [PATCH] Listen to port 80

---
 customers/base/nextcloud-configmap.yml           |  7 +------
 customers/base/nextcloud-deployment.yml          | 16 +++-------------
 customers/base/nextcloud-ingress.yml             |  2 +-
 customers/base/nextcloud-service.yml             |  4 ++--
 customers/overlays/vr/test/nextcloud-ingress.yml |  2 +-
 5 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/customers/base/nextcloud-configmap.yml b/customers/base/nextcloud-configmap.yml
index 869e2a2..1f6c182 100644
--- a/customers/base/nextcloud-configmap.yml
+++ b/customers/base/nextcloud-configmap.yml
@@ -5,13 +5,10 @@ metadata:
 data:
   000-default.conf: |
     LoadModule remoteip_module /usr/lib/apache2/modules/mod_remoteip.so
-    <VirtualHost *:8080>
+    <VirtualHost *:80>
         ServerAdmin webmaster@localhost
         DocumentRoot /var/www/html
         SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
-        ErrorLog /dev/stderr
-        CustomLog /dev/stdout common
-        TransferLog /dev/stdout
 
         # Header config
         RemoteIPHeader X-Forwarded-For
@@ -137,5 +134,3 @@ data:
       ),
 
     );
-  ports.conf: |
-    Listen 8080
diff --git a/customers/base/nextcloud-deployment.yml b/customers/base/nextcloud-deployment.yml
index a316d54..32cbc61 100644
--- a/customers/base/nextcloud-deployment.yml
+++ b/customers/base/nextcloud-deployment.yml
@@ -37,9 +37,6 @@ spec:
             - name: default-config
               mountPath: /etc/apache2/sites-enabled/000-default.conf
               subPath: 000-default.conf
-            - name: ports-config
-              mountPath: /etc/apache2/ports.conf
-              subPath: ports.conf
             - name: hugepage
               mountPath: /dev/hugepages
           resources:
@@ -53,20 +50,19 @@ 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/bash"]
           args: ["-c", "apachectl -D FOREGROUND"]
-            #command: ["/bin/sh","-c", "apachectl -D FOREGROUND; tail -f /dev/null"]
       initContainers:
         - image: docker.sunet.se/sunet/docker-jinja:latest
           name: init-config
@@ -184,12 +180,6 @@ spec:
             items:
               - key: "000-default.conf"
                 path: "000-default.conf"
-        - name: ports-config
-          configMap:
-            name: nextcloud-configmap
-            items:
-              - key: "ports.conf"
-                path: "ports.conf"
         - name: hugepage
           emptyDir:
             medium: HugePages
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