From b1f371ec9d587e3727e85afe34473ed154d1fc48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Gon=C3=A7alves?= <me@rgoncalves.se>
Date: Tue, 13 Feb 2024 23:10:06 +0100
Subject: feat(roles/nextcloud): automate with occ

---
 .../templates/datadirectory.config.php.j2          |   8 +
 roles/nextcloud/templates/etc-php-7.3.ini.j2       | 198 ---------------------
 .../var-www-nextcloud-config-custom.config.php.j2  |   4 -
 3 files changed, 8 insertions(+), 202 deletions(-)
 create mode 100644 roles/nextcloud/templates/datadirectory.config.php.j2
 delete mode 100644 roles/nextcloud/templates/etc-php-7.3.ini.j2
 delete mode 100644 roles/nextcloud/templates/var-www-nextcloud-config-custom.config.php.j2

(limited to 'roles/nextcloud/templates')

diff --git a/roles/nextcloud/templates/datadirectory.config.php.j2 b/roles/nextcloud/templates/datadirectory.config.php.j2
new file mode 100644
index 0000000..d5af69a
--- /dev/null
+++ b/roles/nextcloud/templates/datadirectory.config.php.j2
@@ -0,0 +1,8 @@
+<?php
+
+if (\OC::$CLI) {
+        $CONFIG['datadirectory'] = '{{ nextcloud__data_dir }}';
+} else {
+        $CONFIG['datadirectory'] = '{{ nextcloud__chroot_data_dir }}';
+}
+
diff --git a/roles/nextcloud/templates/etc-php-7.3.ini.j2 b/roles/nextcloud/templates/etc-php-7.3.ini.j2
deleted file mode 100644
index 0e79971..0000000
--- a/roles/nextcloud/templates/etc-php-7.3.ini.j2
+++ /dev/null
@@ -1,198 +0,0 @@
-[PHP]
-auto_append_file=
-auto_globals_jit=On
-auto_prepend_file=
-default_charset="UTF-8"
-default_mimetype="text/html"
-disable_classes=
-disable_functions=
-display_errors=Off
-display_startup_errors=Off
-doc_root=
-enable_dl=Off
-engine=On
-error_reporting=E_ALL & ~E_DEPRECATED & ~E_STRICT
-expose_php=On
-extension_dir="/usr/local/lib/php-7.3/modules"
-html_errors=On
-ignore_repeated_errors=Off
-ignore_repeated_source=Off
-implicit_flush=Off
-include_path=".:/pear/lib:/var/www/pear/lib"
-log_errors=On
-log_errors_max_len=1024
-max_execution_time=30
-output_buffering=4096
-precision=14
-register_argc_argv=Off
-report_memleaks=On
-request_order="GP"
-serialize_precision=-1
-short_open_tag=Off
-unserialize_callback_func=
-user_dir=
-variables_order="GPCS"
-zend.enable_gc=On
-zlib.output_compression=Off
-
-allow_url_fopen=On
-allow_url_include=Off
-default_socket_timeout=60
-file_uploads=On
-max_file_uploads=20
-
-memory_limit={{ nextcloud_php_memory_limit }}
-max_input_time={{ nextcloud_php_max_inputtime }}
-post_max_size={{ nextcloud_php_upload_maxsize }}
-upload_max_filesize={{ nextcloud_php_upload_maxsize }}
-
-pm=dynamic
-pm.maxchildren=120
-pm.start_servers=12
-pm.min_spare_servers=6
-pm.max_spare_servers=18
-
-extension=curl
-extension=gd
-extension=intl
-extension=pdo_pgsql
-extension=zip
-
-[CLI Server]
-cli_server.color=On
-
-[Date]
-date.timezone=UTC
-
-[iconv]
-
-[imap]
-
-[intl]
-
-[sqlite3]
-
-[Pcre]
-
-[Pdo]
-
-[Pdo_mysql]
-pdo_mysql.default_socket=
-
-[Phar]
-
-[mail function]
-SMTP=localhost
-smtp_port=25
-mail.add_x_header=Off
-
-[ODBC]
-odbc.allow_persistent=On
-odbc.check_persistent=On
-odbc.max_persistent=-1
-odbc.max_links=-1
-odbc.defaultlrl=4096
-odbc.defaultbinmode=1
-
-[Interbase]
-ibase.allow_persistent=1
-ibase.max_persistent=-1
-ibase.max_links=-1
-ibase.timestampformat="%Y-%m-%d %H:%M:%S"
-ibase.dateformat="%Y-%m-%d"
-ibase.timeformat="%H:%M:%S"
-
-[MySQLi]
-mysqli.max_persistent=-1
-mysqli.allow_persistent=On
-mysqli.max_links=-1
-mysqli.default_port=3306
-mysqli.default_socket=
-mysqli.default_host=
-mysqli.default_user=
-mysqli.default_pw=
-mysqli.reconnect=Off
-
-[mysqlnd]
-mysqlnd.collect_statistics=On
-mysqlnd.collect_memory_statistics=Off
-
-[OCI8]
-
-[PostgreSQL]
-pgsql.allow_persistent=On
-pgsql.auto_reset_persistent=Off
-pgsql.max_persistent=-1
-pgsql.max_links=-1
-pgsql.ignore_notice=0
-pgsql.log_notice=0
-
-[bcmath]
-bcmath.scale=0
-
-[browscap]
-
-[Session]
-session.save_handler=files
-session.use_strict_mode=0
-session.use_cookies=1
-session.use_only_cookies=1
-session.name=PHPSESSID
-session.auto_start=0
-session.cookie_lifetime=0
-session.cookie_path=/
-session.cookie_domain=
-session.cookie_httponly=
-session.cookie_samesite=
-session.serialize_handler=php
-session.gc_probability=1
-session.gc_divisor=1000
-session.gc_maxlifetime=1440
-session.referer_check=
-session.cache_limiter=nocache
-session.cache_expire=180
-session.use_trans_sid=0
-session.sid_length=26
-session.trans_sid_tags="a=href,area=href,frame=src,form="
-session.sid_bits_per_character=5
-
-[Assertion]
-zend.assertions=-1
-
-[COM]
-
-[mbstring]
-
-[gd]
-
-[exif]
-
-[Tidy]
-
-tidy.clean_output=Off
-
-[soap]
-soap.wsdl_cache_enabled=1
-soap.wsdl_cache_dir="/tmp"
-soap.wsdl_cache_ttl=86400
-soap.wsdl_cache_limit=5
-
-[sysvshm]
-
-[ldap]
-ldap.max_links=-1
-
-[dba]
-
-[opcache]
-opcache.enable=1
-opcache.enable_cli=1
-opcache.memory_consumption=128
-opcache.interned_strings_buffer=8
-opcache.max_accelerated_files=10000
-opcache.revalidate_freq=1
-opcache.save_comments=1
-
-[curl]
-
-[openssl]
diff --git a/roles/nextcloud/templates/var-www-nextcloud-config-custom.config.php.j2 b/roles/nextcloud/templates/var-www-nextcloud-config-custom.config.php.j2
deleted file mode 100644
index 15df079..0000000
--- a/roles/nextcloud/templates/var-www-nextcloud-config-custom.config.php.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
-	'datadirectory' => ((php_sapi_name() == 'cli') ? '/var/www' : '') . '/nextcloud/data',
-);
-- 
cgit v1.2.3