From 8e7102fe170ade9f23ea10f85354fc3bf0b2568d Mon Sep 17 00:00:00 2001
From: Micke Nordin <kano@sunet.se>
Date: Wed, 29 Mar 2023 09:53:15 +0200
Subject: [PATCH] Run own image

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

diff --git a/customers/base/nextcloud-configmap.yml b/customers/base/nextcloud-configmap.yml
index e148c64..e3d72bb 100644
--- a/customers/base/nextcloud-configmap.yml
+++ b/customers/base/nextcloud-configmap.yml
@@ -3,6 +3,37 @@ 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 ef8248f..d07318a 100644
--- a/customers/base/nextcloud-deployment.yml
+++ b/customers/base/nextcloud-deployment.yml
@@ -29,12 +29,14 @@ spec:
       restartPolicy: Always
       containers:
         - name: customer
-          #image: docker.sunet.se/drive/nextcloud-custom:25.0.3.3-4
-          image: nextcloud:latest
+          image: docker.sunet.se/drive/nextcloud-custom:25.0.3.3-4
           volumeMounts:
             - name: nextcloud-data
               mountPath: /var/www/html/config
               subPath: config
+            - name: apache-config
+              mountPath: /etc/apache2/sites-enabled/000-default.conf
+              subPath: 000-default.conf
           resources:
             limits:
               cpu: 1500m
@@ -44,17 +46,18 @@ spec:
               memory: 256Mi
           readinessProbe:
               tcpSocket:
-                port: 80
+                port: 8080
               initialDelaySeconds: 180
               periodSeconds: 60
           livenessProbe:
               tcpSocket:
-                port: 80
+                port: 8080
               initialDelaySeconds: 300
               periodSeconds: 180
           ports:
-            - containerPort: 80
+            - containerPort: 8080
               name: nextcloud-http
+          command: ['/bin/sh', '-c', '/etc/init.d/apache2 start']
       initContainers:
         - image: docker.sunet.se/sunet/docker-jinja:latest
           name: init-config
@@ -166,3 +169,9 @@ spec:
             items:
               - key: "config.php"
                 path: "config.php"
+        - name: apache-config
+          configMap:
+            name: nextcloud-configmap
+            items:
+              - key: "000-default.conf"
+                path: "000-default.conf"
diff --git a/customers/base/nextcloud-ingress.yml b/customers/base/nextcloud-ingress.yml
index fb2548f..0fd50d0 100644
--- a/customers/base/nextcloud-ingress.yml
+++ b/customers/base/nextcloud-ingress.yml
@@ -28,4 +28,4 @@ spec:
           service:
             name: customer-node
             port:
-              number: 80
+              number: 8080
diff --git a/customers/base/nextcloud-service.yml b/customers/base/nextcloud-service.yml
index 29d7fdd..ab22957 100644
--- a/customers/base/nextcloud-service.yml
+++ b/customers/base/nextcloud-service.yml
@@ -9,9 +9,9 @@ items:
     name: customer-node
   spec:
     ports:
-    - port: 80
+    - port: 8080
       protocol: TCP
-      targetPort: 80
+      targetPort: 8080
     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 9bec27e..0cbf4f5 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: 80
+              number: 8080