Sort config and add branch

customers/base/nextcloud-configmap.yml

@@ -6,62 +6,29 @@ data:
   config.php: |
     <?php
     $CONFIG = array (
-      'memcache.local' => '\\OC\\Memcache\\APCu',
+      'app_install_overwrite' =>
-      'appstoreenabled' => false,
+        array (
+          0 => 'globalsiteselector',
+        ),
       'apps_paths' =>
-      array (
-        0 =>
         array (
-          'path' => '/var/www/html/apps',
+          0 =>
-          'url' => '/apps',
+            array (
-          'writable' => false,
+              'path' => '/var/www/html/apps',
+              'url' => '/apps',
+              'writable' => false,
+            ),
+          1 =>
+            array (
+              'path' => '/var/www/html/custom_apps',
+              'url' => '/custom_apps',
+              'writable' => true,
+            ),
         ),
-        1 =>
+      'appstoreenabled' => false,
-        array (
+      'branch' => 'Sunet',
-          'path' => '/var/www/html/custom_apps',
-          'url' => '/custom_apps',
-          'writable' => true,
-        ),
-      ),
-      'memcache.distributed' => '\\OC\\Memcache\\Redis',
-      'memcache.locking' => '\\OC\\Memcache\\Redis',
-      'redis' =>
-      array (
-        'host' => '{{REDIS_HOST}}',
-        'port' => 6379,
-      ),
-      'forcessl' => true,
-      'overwriteprotocol' => 'https',
-      'objectstore' =>
-      array (
-        'class' => '\\OC\\Files\\ObjectStore\\S3',
-        'arguments' =>
-        array (
-          'bucket' => '{{OBJECTSTORE_S3_BUCKET}}',
-          'key' => '{{OBJECTSTORE_S3_KEY}}',
-          'secret' => '{{OBJECTSTORE_S3_SECRET}}',
-          'region' => '{{OBJECTSTORE_S3_REGION}}',
-          'hostname' => '{{OBJECTSTORE_S3_HOST}}',
-          'port' => '',
-          'objectPrefix' => 'urn:oid:',
-          'autocreate' => false,
-          'use_ssl' => true,
-          'use_path_style' => true,
-          'legacy_auth' => false,
-        ),
-      ),
-      'csrf.disabled' => true,
-      'passwordsalt' => '{{NEXTCLOUD_PASSWORDSALT}}',
-      'secret' => '{{NEXTCLOUD_SECRET}}',
-      'trusted_domains' =>
-      array (
-        0 => '{{NEXTCLOUD_TRUSTED_DOMAINS}}'
-      ),
-      'trusted_proxies' =>
-      array (
-        0 => '10.0.0.0/8'
-      ),
       'config_is_read_only' => true,
+      'csrf.disabled' => true,
       'datadirectory' => '/var/www/html/data',
       'dbhost' => '{{MYSQL_HOST}}:{{MYSQL_PORT}}',
       'dbname' => '{{MYSQL_DATABASE}}',
@@ -71,6 +38,7 @@ data:
       'dbtype' => 'mysql',
       'dbuser' => '{{MYSQL_USER}}',
       'default_phone_region' => 'SE',
+      'forcessl' => true,
       'gs.enabled' => 'true',
       'gs.federation' => 'global',
       'gs.trustedHosts' => ['*.sunet.se'],
@@ -95,20 +63,52 @@ data:
       'mail_smtpport' => '587',
       'mail_smtpsecure' => 'tls',
       'mail_template_class' => 'OCA\DriveEmailTemplate\EMailTemplate',
+      'memcache.distributed' => '\\OC\\Memcache\\Redis',
+      'memcache.local' => '\\OC\\Memcache\\APCu',
+      'memcache.locking' => '\\OC\\Memcache\\Redis',
       'mysql.utf8mb4' => true,
-      'overwritehost' => '{{SITE_NAME}}',
+      'objectstore' =>
+        array (
+          'class' => '\\OC\\Files\\ObjectStore\\S3',
+          'arguments' =>
+            array (
+              'autocreate' => false,
+              'bucket' => '{{OBJECTSTORE_S3_BUCKET}}',
+              'hostname' => '{{OBJECTSTORE_S3_HOST}}',
+              'key' => '{{OBJECTSTORE_S3_KEY}}',
+              'legacy_auth' => false,
+              'objectPrefix' => 'urn:oid:',
+              'port' => '',
+              'region' => '{{OBJECTSTORE_S3_REGION}}',
+              'secret' => '{{OBJECTSTORE_S3_SECRET}}',
+              'use_path_style' => true,
+              'use_ssl' => true,
+            ),
+        ),
       'overwrite.cli.url' => 'https://{{SITE_NAME}}',
-      'templatedirectory' => '',
+      'overwritehost' => '{{SITE_NAME}}',
+      'overwriteprotocol' => 'https',
+      'passwordsalt' => '{{NEXTCLOUD_PASSWORDSALT}}',
+      'secret' => '{{NEXTCLOUD_SECRET}}',
+      'redis' =>
+        array (
+          'host' => '{{REDIS_HOST}}',
+          'port' => 6379,
+        ),
       'skeletondirectory' => '',
+      'templatedirectory' => '',
+      'trusted_domains' =>
+        array (
+          0 => '{{NEXTCLOUD_TRUSTED_DOMAINS}}'
+        ),
+      'trusted_proxies' =>
+        array (
+          0 => '10.0.0.0/8'
+        ),
       'twofactor_enforced' => 'true',
       'twofactor_enforced_groups' =>
-      array (
+        array (
-        0 => 'admin',
+          0 => 'admin',
-      ),
+        ),
       'version' => '{{NEXTCLOUD_VERSION_STRING}}',
-      'app_install_overwrite' =>
-      array (
-        0 => 'globalsiteselector',
-      ),
-
     );