From 5f318a27fce1b88639d28e186bf18b9ca74ca730 Mon Sep 17 00:00:00 2001
From: Olivier Navas <olivier.navas@libretic.fr>
Date: Fri, 6 Oct 2023 15:47:16 +0200
Subject: [PATCH] Adaptations pour paheko 1.3.0

---
 README.md                    |  2 +-
 tasks/main.yml               |  1 -
 templates/config.local.php   | 16 ++++++--
 templates/docker-compose.yml |  1 -
 templates/php.ini            | 72 ------------------------------------
 5 files changed, 14 insertions(+), 78 deletions(-)
 delete mode 100644 templates/php.ini

diff --git a/README.md b/README.md
index c0df908..235d808 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Fournir les variables suivantes. Par exemple :
 
 ```yaml
 docker_paheko_fqdn: paheko.example.com
-docker_paheko_version: 1.2.4
+docker_paheko_version: 1.3.0
 docker_paheko_data_dir: /data1
 docker_paheko_service_id: paheko
 docker_paheko_smtp_server: smtp.example.com
diff --git a/tasks/main.yml b/tasks/main.yml
index f0c34c2..4f19c2e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -16,5 +16,4 @@
   with_items:
     - docker-compose.yml
     - config.local.php
-    - php.ini
   notify: docker-compose-up
diff --git a/templates/config.local.php b/templates/config.local.php
index e5c1ddf..09c1eb9 100644
--- a/templates/config.local.php
+++ b/templates/config.local.php
@@ -1,14 +1,24 @@
 <?php
-namespace Garradin;
+namespace Paheko;
 
-// Some random key of more than 30 characters 
+// Some random key of more than 30 characters
 // openssl rand -base64 40
 const SECRET_KEY = '{{ docker_paheko_secret_key }}';
 
 // SMTP parameters
 const SMTP_HOST = '{{ docker_paheko_smtp_server }}';
-const SMTP_PORT = 25;
+{% if docker_paheko_smtp_port is defined %}
+const SMTP_PORT = '{{ docker_paheko_smtp_port }}';
+{% endif %}
+{% if docker_paheko_smtp_security is defined %}
+const SMTP_SECURITY = '{{ docker_paheko_smtp_security }}';
+{% else %}
 const SMTP_SECURITY = 'NONE';
+{% endif %}
+{% if docker_paheko_smtp_user is defined %}
+const SMTP_USER = '{{ docker_paheko_smtp_user }}';
+const SMTP_PASSWORD = '{{ docker_paheko_smtp_password }}';
+{% endif %}
 
 // Upgrades should be handled by new docker image version
 const ENABLE_UPGRADES = false;
diff --git a/templates/docker-compose.yml b/templates/docker-compose.yml
index eaaa22e..2be0073 100644
--- a/templates/docker-compose.yml
+++ b/templates/docker-compose.yml
@@ -8,7 +8,6 @@ services:
     restart: always
     volumes:
       - ./config.local.php:/var/www/paheko/config.local.php
-      - ./php.ini:/usr/local/etc/php/php.ini
       - {{ docker_paheko_data_dir }}/{{ docker_paheko_service_id }}/data:/var/www/paheko/data
       - /var/www/paheko/data/plugins
     labels:
diff --git a/templates/php.ini b/templates/php.ini
deleted file mode 100644
index 7d8b5c2..0000000
--- a/templates/php.ini
+++ /dev/null
@@ -1,72 +0,0 @@
-# from production php.ini
-[PHP]
-engine = On
-short_open_tag = Off
-precision = 14
-output_buffering = 4096
-zlib.output_compression = Off
-implicit_flush = Off
-unserialize_callback_func =
-serialize_precision = -1
-disable_functions =
-disable_classes =
-zend.enable_gc = On
-zend.exception_ignore_args = On
-expose_php = On
-max_execution_time = 30
-max_input_time = 60
-memory_limit = 128M
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
-display_errors = Off
-display_startup_errors = Off
-log_errors = On
-log_errors_max_len = 1024
-ignore_repeated_errors = Off
-ignore_repeated_source = Off
-report_memleaks = On
-variables_order = "GPCS"
-request_order = "GP"
-register_argc_argv = Off
-auto_globals_jit = On
-post_max_size = {{ docker_paheko_max_file_size_mb }}M
-auto_prepend_file =
-auto_append_file =
-default_mimetype = "text/html"
-default_charset = "UTF-8"
-doc_root =
-user_dir =
-enable_dl = Off
-file_uploads = On
-upload_max_filesize = {{ docker_paheko_max_file_size_mb }}M
-max_file_uploads = 20
-allow_url_fopen = On
-allow_url_include = Off
-default_socket_timeout = 60
-[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
-[Tidy]
-tidy.clean_output = Off
-