From 8fc6757dbd32b0a785556e9c2d00a870b03dbae3 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Fri, 20 Aug 2021 11:45:44 +0200
Subject: [PATCH] nextcloud config from configmap

---
 apps/nextcloud/Dockerfile      |  2 +-
 apps/nextcloud/README.md       |  2 +
 apps/nextcloud/config.php      | 99 ++++++++++++++++------------------
 apps/nextcloud/deployment.yaml |  6 +++
 4 files changed, 56 insertions(+), 53 deletions(-)
 create mode 100644 apps/nextcloud/README.md

diff --git a/apps/nextcloud/Dockerfile b/apps/nextcloud/Dockerfile
index f425867..5aa636b 100644
--- a/apps/nextcloud/Dockerfile
+++ b/apps/nextcloud/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get clean -y && \
 RUN	touch /usr/src/nextcloud/data/.ocdata
 COPY config.php /usr/src/nextcloud/config/
 #COPY htaccess-data /usr/src/nextcloud/data/.htaccess
-COPY apache-default-vhost.conf /etc/apache2/sites-available/000-default.conf
+#COPY apache-default-vhost.conf /etc/apache2/sites-available/000-default.conf
 RUN mv /usr/src/nextcloud/.htaccess /usr/src/nextcloud/.htaccess.bak
 RUN mv /usr/src/nextcloud/config/.htaccess /usr/src/nextcloud/config/.htaccess.bak
 
diff --git a/apps/nextcloud/README.md b/apps/nextcloud/README.md
new file mode 100644
index 0000000..51965af
--- /dev/null
+++ b/apps/nextcloud/README.md
@@ -0,0 +1,2 @@
+# kubectl -n live-env create configmap nextcloud-config --from-file=config.php
+# kubectl -n live-env create configmap nextcloud-nginx-site --from-file=nginx-site.configmap.conf
diff --git a/apps/nextcloud/config.php b/apps/nextcloud/config.php
index 2cc9f11..fa4093d 100644
--- a/apps/nextcloud/config.php
+++ b/apps/nextcloud/config.php
@@ -1,59 +1,54 @@
 <?php
 //
-//Manually deployed by yourself
+// Manually deployed by yourself
 //
-$CONFIG = array (
-  'htaccess.RewriteBase' => '/',
-  'memcache.local' => '\\OC\\Memcache\\APCu',
-  'apps_paths' => 
-  array (
-    0 => 
-    array (
-      'path' => '/var/www/html/apps',
-      'url' => '/apps',
-      'writable' => false,
+$CONFIG = array(
+    'htaccess.RewriteBase' => '/',
+    'memcache.local' => '\\OC\\Memcache\\APCu',
+    'apps_paths' => array(
+        0 => array(
+            'path' => '/var/www/html/apps',
+            'url' => '/apps',
+            'writable' => false
+        ),
+        1 => array(
+            'path' => '/var/www/html/custom_apps',
+            'url' => '/custom_apps',
+            'writable' => true
+        )
     ),
-    1 => 
-    array (
-      'path' => '/var/www/html/custom_apps',
-      'url' => '/custom_apps',
-      'writable' => true,
+    'objectstore' => array(
+        'class' => '\\OC\\Files\\ObjectStore\\S3',
+        'arguments' => array(
+            'bucket' => 'nextcloud',
+            'key' => 'nextcloud',
+            'secret' => 'tWnc3zdxcDUvcX5f9uY7RRYvKLcWI1KY',
+            'region' => '',
+            'hostname' => 'minio.live-infra.svc.cluster.local',
+            'port' => '443',
+            'objectPrefix' => 'urn:oid:',
+            'autocreate' => false,
+            'use_ssl' => true,
+            'use_path_style' => true,
+            'legacy_auth' => false
+        )
     ),
-  ),
-  'objectstore' => 
-  array (
-    'class' => '\\OC\\Files\\ObjectStore\\S3',
-    'arguments' => 
-    array (
-      'bucket' => 'nextcloud',
-      'key' => 'nextcloud',
-      'secret' => 'tWnc3zdxcDUvcX5f9uY7RRYvKLcWI1KY',
-      'region' => '',
-      'hostname' => 'minio.live-infra.svc.cluster.local',
-      'port' => '443',
-      'objectPrefix' => 'urn:oid:',
-      'autocreate' => false,
-      'use_ssl' => true,
-      'use_path_style' => true,
-      'legacy_auth' => false,
+    'instanceid' => 'ocsxqijfvpf7',
+    'passwordsalt' => 'OTjmXJP0VKlw+OLja6wUxbHlZk4Txw',
+    'secret' => '0g94SdF7A2k/LHTKUM+8HwEDFgF1zz7I/sMauap02/d8G677',
+    'trusted_domains' => array(
+        0 => 'nc.lan'
     ),
-  ),
-  'instanceid' => 'ocsxqijfvpf7',
-  'passwordsalt' => 'OTjmXJP0VKlw+OLja6wUxbHlZk4Txw',
-  'secret' => '0g94SdF7A2k/LHTKUM+8HwEDFgF1zz7I/sMauap02/d8G677',
-  'trusted_domains' => 
-  array (
-    0 => 'nc.lan',
-  ),
-  'datadirectory' => '/var/www/html/data',
-  'dbtype' => 'pgsql',
-  'version' => '20.0.9.1',
-  'overwrite.cli.url' => 'http://nc.lan',
-  'dbname' => 'nextcloud',
-  'dbhost' => 'postgres.live-env.svc.cluster.local:5432',
-  'dbport' => '',
-  'dbtableprefix' => 'oc_',
-  'dbuser' => 'nextcloud',
-  'dbpassword' => 'Vb7yHzmE5HIjfU4hf89aXAmEEmxAnMdB',
-  'installed' => true,
+    'datadirectory' => '/var/www/html/data',
+    'dbtype' => 'pgsql',
+    'version' => '20.0.9.1',
+    'overwrite.cli.url' => 'http://nc.lan',
+    'dbname' => 'nextcloud',
+    'dbhost' => 'postgres.live-env.svc.cluster.local:5432',
+    'dbport' => '',
+    'dbtableprefix' => 'oc_',
+    'dbuser' => 'nextcloud',
+    'dbpassword' => 'Vb7yHzmE5HIjfU4hf89aXAmEEmxAnMdB',
+    'installed' => true,
+    'default_phone_region' => 'DE'
 );
\ No newline at end of file
diff --git a/apps/nextcloud/deployment.yaml b/apps/nextcloud/deployment.yaml
index 223f4e8..c321cb2 100644
--- a/apps/nextcloud/deployment.yaml
+++ b/apps/nextcloud/deployment.yaml
@@ -25,6 +25,9 @@ spec:
         - name: nextcloud-nginx-site
           configMap:
             name: nextcloud-nginx-site
+        - name: nextcloud-config
+          configMap:
+            name: nextcloud-config
         - name: www-data
           emptyDir: {}
       containers:
@@ -49,6 +52,9 @@ spec:
           volumeMounts:
             - name: www-data
               mountPath: /var/www/html
+            - name: nextcloud-config
+              mountPath: /var/www/html/config/config.php
+              subPath: config.php
           env:
             - name: TZ
               value: "Europe/Berlin"