Merge branch 'master' of ssh://yuno.oiseauroch.fr:6969/tobias/infra-oasis21

nextcloud/.gitignore

@@ -1,2 +1,3 @@
 *.secrets
 .env
+config.php

nextcloud/config.php

@@ -1,62 +0,0 @@
-<?php
-$CONFIG = array (
-  'instanceid' => 'oc00cptraqej',
-  'passwordsalt' => 'QDWCIlUPIxBCPkOPapq39bHhFtrADT',
-  'secret' => 'xfKWpSH0/UV4PYUClkDRyaeiYc2SugcEe0/mZVB7/6lElAQE',
-  'trusted_domains' => 
-  array (
-    0 => 'cloud.oasis21.org',
-  ),
-  '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,
-   	),
-    ),
-  'datadirectory' => '/var/www/html/data',
-  'dbtype' => 'pgsql',
-  'version' => '23.0.0.10',
-  'overwrite.cli.url' => 'https://cloud.oasis21.org',
-  'dbname' => 'nc',
-  'dbhost' => 'nextcloud-db',
-  'dbport' => '',
-  'dbtableprefix' => 'oc_',
-  'dbuser' => 'nc',
-  'dbpassword' => 'tavnuenRo',
-  'installed' => true,
-  'logfile' => '/var/log/nextcloud/nextcloud.log',
-  'log_type' => 'file',
-  'htaccess.RewriteBase' => '/',
-  'skeletondirectory' => '',
-  'memcache.local' => '\\OC\\Memcache\\APCu',
-  'memcache.locking' => '\\OC\\Memcache\\Redis',
-  'memcache.distributed' => '\\OC\\Memcache\\Redis',
-  'redis' => 
-  array (
-    'host' => '/redis',
-    'password' => '',
-    'port' => 6379,
-  ),
-  'default_phone_region' => 'FR',
-  'defaultapp' => 'files',
-  'encryption.legacy_format_support' => false,
-  'simpleSignUpLink.shown' => false,
-  'updater.release.channel' => 'stable',
-  'mail_domain' => 'oasis21.org',
-  'mail_from_address' => 'nextcloud',
-  'mail_smtpmode' => 'smtp',
-  'loglevel' => 0,
-  'integrity.check.disabled' => false,
-  'ldapUserCleanupInterval' => '10',
-  'ldapProviderFactory' => 'OCA\\User_LDAP\\LDAPProviderFactory',
-  'maintenance' => false,
-);

nextcloud/loolwsd.xml

@@ -157,7 +157,7 @@
         <enable desc="Enable the admin console functionality" type="bool" default="true">true</enable>
         <enable_pam desc="Enable admin user authentication with PAM" type="bool" default="false">false</enable_pam>
         <username desc="The username of the admin console. Ignored if PAM is enabled.">nextcloud</username>
-        <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or loolconfig to set up a secure password.">o!NdFB7fpQAbXG</password>
+        <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or loolconfig to set up a secure password.">__COLLABORA__PASSWORD__</password>
     </admin_console>
 
     <monitors desc="Addresses of servers we connect to on start for monitoring">