From 98e96698b7a9b4d9523560e36d3f1d30937aafd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 15:14:38 +0200
Subject: [PATCH 01/26] fix

---
 conf/{.env.mysql => .env}   |   0
 conf/.env.sqlite            |  21 --
 conf/{mysql.src => app.src} |   0
 conf/extra_php-fpm.conf     |   4 +
 conf/php-fpm.conf           | 430 ------------------------------------
 conf/sqlite.src             |   7 -
 scripts/install             |   2 +-
 scripts/upgrade             |   4 +-
 8 files changed, 7 insertions(+), 461 deletions(-)
 rename conf/{.env.mysql => .env} (100%)
 delete mode 100644 conf/.env.sqlite
 rename conf/{mysql.src => app.src} (100%)
 create mode 100644 conf/extra_php-fpm.conf
 delete mode 100644 conf/php-fpm.conf
 delete mode 100644 conf/sqlite.src

diff --git a/conf/.env.mysql b/conf/.env
similarity index 100%
rename from conf/.env.mysql
rename to conf/.env
diff --git a/conf/.env.sqlite b/conf/.env.sqlite
deleted file mode 100644
index 46d4606..0000000
--- a/conf/.env.sqlite
+++ /dev/null
@@ -1,21 +0,0 @@
-# Configure your database connection and set the correct server version:
-# for MySQL "serverVersion=5.7" and for MariaDB "serverVersion=mariadb-10.5.8"
-DATABASE_URL=sqlite:///%kernel.project_dir%/var/data/kimai.sqlite
-
-# Email will be sent with this address as sender
-MAILER_FROM=admin@__DOMAIN__
-# Email connection (disabled by default) more info at https://www.kimai.org/documentation/emails.html
-MAILER_URL=smtp://localhost:25?encryption=&auth_mode=
-
-# do not change, unless you are developing for Kimai
-APP_ENV=prod
-
-# should be changed to a unique character sequence
-APP_SECRET=__RANDOM_KEY__
-
-# unlikely, that you need to change this one
-CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$
-
-# Running behind reverse proxies? Use those:
-TRUSTED_PROXIES=127.0.0.1
-TRUSTED_HOSTS=localhost,__DOMAIN__
diff --git a/conf/mysql.src b/conf/app.src
similarity index 100%
rename from conf/mysql.src
rename to conf/app.src
diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
new file mode 100644
index 0000000..700c37c
--- /dev/null
+++ b/conf/extra_php-fpm.conf
@@ -0,0 +1,4 @@
+; Additional php.ini defines, specific to this pool of workers.
+
+php_admin_value[upload_max_filesize] = 50M
+php_admin_value[post_max_size] = 50M
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
deleted file mode 100644
index ab1a471..0000000
--- a/conf/php-fpm.conf
+++ /dev/null
@@ -1,430 +0,0 @@
-; Start a new pool named 'www'.
-; the variable $pool can be used in any directive and will be replaced by the
-; pool name ('www' here)
-[__NAMETOCHANGE__]
-
-; Per pool prefix
-; It only applies on the following directives:
-; - 'access.log'
-; - 'slowlog'
-; - 'listen' (unixsocket)
-; - 'chroot'
-; - 'chdir'
-; - 'php_values'
-; - 'php_admin_values'
-; When not set, the global prefix (or /usr) applies instead.
-; Note: This directive can also be relative to the global prefix.
-; Default Value: none
-;prefix = /path/to/pools/$pool
-
-; Unix user/group of processes
-; Note: The user is mandatory. If the group is not set, the default user's group
-;       will be used.
-user = __USER__
-group = __USER__
-
-; The address on which to accept FastCGI requests.
-; Valid syntaxes are:
-;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
-;                            a specific port;
-;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
-;                            a specific port;
-;   'port'                 - to listen on a TCP socket to all addresses
-;                            (IPv6 and IPv4-mapped) on a specific port;
-;   '/path/to/unix/socket' - to listen on a unix socket.
-; Note: This value is mandatory.
-listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock
-
-; Set listen(2) backlog.
-; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 511
-
-; Set permissions for unix socket, if one is used. In Linux, read/write
-; permissions must be set in order to allow connections from a web server. Many
-; BSD-derived systems allow connections regardless of permissions.
-; Default Values: user and group are set as the running user
-;                 mode is set to 0660
-listen.owner = www-data
-listen.group = www-data
-;listen.mode = 0660
-; When POSIX Access Control Lists are supported you can set them using
-; these options, value is a comma separated list of user/group names.
-; When set, listen.owner and listen.group are ignored
-;listen.acl_users =
-;listen.acl_groups =
-
-; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
-; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
-; must be separated by a comma. If this value is left blank, connections will be
-; accepted from any ip address.
-; Default Value: any
-;listen.allowed_clients = 127.0.0.1
-
-; Specify the nice(2) priority to apply to the pool processes (only if set)
-; The value can vary from -19 (highest priority) to 20 (lower priority)
-; Note: - It will only work if the FPM master process is launched as root
-;       - The pool processes will inherit the master process priority
-;         unless it specified otherwise
-; Default Value: no set
-; process.priority = -19
-
-; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
-; or group is differrent than the master process user. It allows to create process
-; core dump and ptrace the process for the pool user.
-; Default Value: no
-; process.dumpable = yes
-
-; Choose how the process manager will control the number of child processes.
-; Possible Values:
-;   static  - a fixed number (pm.max_children) of child processes;
-;   dynamic - the number of child processes are set dynamically based on the
-;             following directives. With this process management, there will be
-;             always at least 1 children.
-;             pm.max_children      - the maximum number of children that can
-;                                    be alive at the same time.
-;             pm.start_servers     - the number of children created on startup.
-;             pm.min_spare_servers - the minimum number of children in 'idle'
-;                                    state (waiting to process). If the number
-;                                    of 'idle' processes is less than this
-;                                    number then some children will be created.
-;             pm.max_spare_servers - the maximum number of children in 'idle'
-;                                    state (waiting to process). If the number
-;                                    of 'idle' processes is greater than this
-;                                    number then some children will be killed.
-;  ondemand - no children are created at startup. Children will be forked when
-;             new requests will connect. The following parameter are used:
-;             pm.max_children           - the maximum number of children that
-;                                         can be alive at the same time.
-;             pm.process_idle_timeout   - The number of seconds after which
-;                                         an idle process will be killed.
-; Note: This value is mandatory.
-pm = dynamic
-
-; The number of child processes to be created when pm is set to 'static' and the
-; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
-; This value sets the limit on the number of simultaneous requests that will be
-; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
-; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
-; CGI. The below defaults are based on a server without much resources. Don't
-; forget to tweak pm.* to fit your needs.
-; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
-; Note: This value is mandatory.
-pm.max_children = 5
-
-; The number of child processes created on startup.
-; Note: Used only when pm is set to 'dynamic'
-; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
-pm.start_servers = 2
-
-; The desired minimum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.min_spare_servers = 1
-
-; The desired maximum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.max_spare_servers = 3
-
-; The number of seconds after which an idle process will be killed.
-; Note: Used only when pm is set to 'ondemand'
-; Default Value: 10s
-;pm.process_idle_timeout = 10s;
-
-; The number of requests each child process should execute before respawning.
-; This can be useful to work around memory leaks in 3rd party libraries. For
-; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
-; Default Value: 0
-;pm.max_requests = 500
-
-; The URI to view the FPM status page. If this value is not set, no URI will be
-; recognized as a status page. It shows the following informations:
-;   pool                 - the name of the pool;
-;   process manager      - static, dynamic or ondemand;
-;   start time           - the date and time FPM has started;
-;   start since          - number of seconds since FPM has started;
-;   accepted conn        - the number of request accepted by the pool;
-;   listen queue         - the number of request in the queue of pending
-;                          connections (see backlog in listen(2));
-;   max listen queue     - the maximum number of requests in the queue
-;                          of pending connections since FPM has started;
-;   listen queue len     - the size of the socket queue of pending connections;
-;   idle processes       - the number of idle processes;
-;   active processes     - the number of active processes;
-;   total processes      - the number of idle + active processes;
-;   max active processes - the maximum number of active processes since FPM
-;                          has started;
-;   max children reached - number of times, the process limit has been reached,
-;                          when pm tries to start more children (works only for
-;                          pm 'dynamic' and 'ondemand');
-; Value are updated in real time.
-; Example output:
-;   pool:                 www
-;   process manager:      static
-;   start time:           01/Jul/2011:17:53:49 +0200
-;   start since:          62636
-;   accepted conn:        190460
-;   listen queue:         0
-;   max listen queue:     1
-;   listen queue len:     42
-;   idle processes:       4
-;   active processes:     11
-;   total processes:      15
-;   max active processes: 12
-;   max children reached: 0
-;
-; By default the status page output is formatted as text/plain. Passing either
-; 'html', 'xml' or 'json' in the query string will return the corresponding
-; output syntax. Example:
-;   http://www.foo.bar/status
-;   http://www.foo.bar/status?json
-;   http://www.foo.bar/status?html
-;   http://www.foo.bar/status?xml
-;
-; By default the status page only outputs short status. Passing 'full' in the
-; query string will also return status for each pool process.
-; Example:
-;   http://www.foo.bar/status?full
-;   http://www.foo.bar/status?json&full
-;   http://www.foo.bar/status?html&full
-;   http://www.foo.bar/status?xml&full
-; The Full status returns for each process:
-;   pid                  - the PID of the process;
-;   state                - the state of the process (Idle, Running, ...);
-;   start time           - the date and time the process has started;
-;   start since          - the number of seconds since the process has started;
-;   requests             - the number of requests the process has served;
-;   request duration     - the duration in µs of the requests;
-;   request method       - the request method (GET, POST, ...);
-;   request URI          - the request URI with the query string;
-;   content length       - the content length of the request (only with POST);
-;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
-;   script               - the main script called (or '-' if not set);
-;   last request cpu     - the %cpu the last request consumed
-;                          it's always 0 if the process is not in Idle state
-;                          because CPU calculation is done when the request
-;                          processing has terminated;
-;   last request memory  - the max amount of memory the last request consumed
-;                          it's always 0 if the process is not in Idle state
-;                          because memory calculation is done when the request
-;                          processing has terminated;
-; If the process is in Idle state, then informations are related to the
-; last request the process has served. Otherwise informations are related to
-; the current request being served.
-; Example output:
-;   ************************
-;   pid:                  31330
-;   state:                Running
-;   start time:           01/Jul/2011:17:53:49 +0200
-;   start since:          63087
-;   requests:             12808
-;   request duration:     1250261
-;   request method:       GET
-;   request URI:          /test_mem.php?N=10000
-;   content length:       0
-;   user:                 -
-;   script:               /home/fat/web/docs/php/test_mem.php
-;   last request cpu:     0.00
-;   last request memory:  0
-;
-; Note: There is a real-time FPM status monitoring sample web page available
-;       It's available in: /usr/share/php/7.0/fpm/status.html
-;
-; Note: The value must start with a leading slash (/). The value can be
-;       anything, but it may not be a good idea to use the .php extension or it
-;       may conflict with a real PHP file.
-; Default Value: not set
-;pm.status_path = /status
-
-; The ping URI to call the monitoring page of FPM. If this value is not set, no
-; URI will be recognized as a ping page. This could be used to test from outside
-; that FPM is alive and responding, or to
-; - create a graph of FPM availability (rrd or such);
-; - remove a server from a group if it is not responding (load balancing);
-; - trigger alerts for the operating team (24/7).
-; Note: The value must start with a leading slash (/). The value can be
-;       anything, but it may not be a good idea to use the .php extension or it
-;       may conflict with a real PHP file.
-; Default Value: not set
-;ping.path = /ping
-
-; This directive may be used to customize the response of a ping request. The
-; response is formatted as text/plain with a 200 response code.
-; Default Value: pong
-;ping.response = pong
-
-; The access log file
-; Default: not set
-;access.log = log/$pool.access.log
-
-; The access log format.
-; The following syntax is allowed
-;  %%: the '%' character
-;  %C: %CPU used by the request
-;      it can accept the following format:
-;      - %{user}C for user CPU only
-;      - %{system}C for system CPU only
-;      - %{total}C  for user + system CPU (default)
-;  %d: time taken to serve the request
-;      it can accept the following format:
-;      - %{seconds}d (default)
-;      - %{miliseconds}d
-;      - %{mili}d
-;      - %{microseconds}d
-;      - %{micro}d
-;  %e: an environment variable (same as $_ENV or $_SERVER)
-;      it must be associated with embraces to specify the name of the env
-;      variable. Some exemples:
-;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
-;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
-;  %f: script filename
-;  %l: content-length of the request (for POST request only)
-;  %m: request method
-;  %M: peak of memory allocated by PHP
-;      it can accept the following format:
-;      - %{bytes}M (default)
-;      - %{kilobytes}M
-;      - %{kilo}M
-;      - %{megabytes}M
-;      - %{mega}M
-;  %n: pool name
-;  %o: output header
-;      it must be associated with embraces to specify the name of the header:
-;      - %{Content-Type}o
-;      - %{X-Powered-By}o
-;      - %{Transfert-Encoding}o
-;      - ....
-;  %p: PID of the child that serviced the request
-;  %P: PID of the parent of the child that serviced the request
-;  %q: the query string
-;  %Q: the '?' character if query string exists
-;  %r: the request URI (without the query string, see %q and %Q)
-;  %R: remote IP address
-;  %s: status (response code)
-;  %t: server time the request was received
-;      it can accept a strftime(3) format:
-;      %d/%b/%Y:%H:%M:%S %z (default)
-;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
-;  %T: time the log has been written (the request has finished)
-;      it can accept a strftime(3) format:
-;      %d/%b/%Y:%H:%M:%S %z (default)
-;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
-;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
-;  %u: remote user
-;
-; Default: "%R - %u %t \"%m %r\" %s"
-;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
-
-; The log file for slow requests
-; Default Value: not set
-; Note: slowlog is mandatory if request_slowlog_timeout is set
-;slowlog = log/$pool.log.slow
-
-; The timeout for serving a single request after which a PHP backtrace will be
-; dumped to the 'slowlog' file. A value of '0s' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_slowlog_timeout = 0
-
-; The timeout for serving a single request after which the worker process will
-; be killed. This option should be used when the 'max_execution_time' ini option
-; does not stop script execution for some reason. A value of '0' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-request_terminate_timeout = 1d
-
-; Set open file descriptor rlimit.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Chroot to this directory at the start. This value must be defined as an
-; absolute path. When this value is not set, chroot is not used.
-; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
-; of its subdirectories. If the pool prefix is not set, the global prefix
-; will be used instead.
-; Note: chrooting is a great security feature and should be used whenever
-;       possible. However, all PHP paths will be relative to the chroot
-;       (error_log, sessions.save_path, ...).
-; Default Value: not set
-;chroot =
-
-; Chdir to this directory at the start.
-; Note: relative path can be used.
-; Default Value: current directory or / when chroot
-chdir = __FINALPATH__
-
-; Redirect worker stdout and stderr into main error log. If not set, stdout and
-; stderr will be redirected to /dev/null according to FastCGI specs.
-; Note: on highloaded environement, this can cause some delay in the page
-; process time (several ms).
-; Default Value: no
-;catch_workers_output = yes
-
-; Clear environment in FPM workers
-; Prevents arbitrary environment variables from reaching FPM worker processes
-; by clearing the environment in workers before env vars specified in this
-; pool configuration are added.
-; Setting to "no" will make all environment variables available to PHP code
-; via getenv(), $_ENV and $_SERVER.
-; Default Value: yes
-;clear_env = no
-
-; Limits the extensions of the main script FPM will allow to parse. This can
-; prevent configuration mistakes on the web server side. You should only limit
-; FPM to .php extensions to prevent malicious users to use other extensions to
-; execute php code.
-; Note: set an empty value to allow all extensions.
-; Default Value: .php
-;security.limit_extensions = .php .php3 .php4 .php5 .php7
-
-; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
-; the current environment.
-; Default Value: clean env
-;env[HOSTNAME] = $HOSTNAME
-;env[PATH] = /usr/local/bin:/usr/bin:/bin
-;env[TMP] = /tmp
-;env[TMPDIR] = /tmp
-;env[TEMP] = /tmp
-
-; Additional php.ini defines, specific to this pool of workers. These settings
-; overwrite the values previously defined in the php.ini. The directives are the
-; same as the PHP SAPI:
-;   php_value/php_flag             - you can set classic ini defines which can
-;                                    be overwritten from PHP call 'ini_set'.
-;   php_admin_value/php_admin_flag - these directives won't be overwritten by
-;                                     PHP call 'ini_set'
-; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
-
-; Defining 'extension' will load the corresponding shared extension from
-; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
-; overwrite previously defined php.ini values, but will append the new value
-; instead.
-
-; Note: path INI options can be relative and will be expanded with the prefix
-; (pool, global or /usr)
-
-; Default Value: nothing is defined by default except the values in php.ini and
-;                specified at startup with the -d argument
-;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
-;php_flag[display_errors] = off
-;php_admin_value[error_log] = /var/log/fpm-php.www.log
-;php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
-
-; Common values to change to increase file upload limit
-; php_admin_value[upload_max_filesize] = 50M
-; php_admin_value[post_max_size] = 50M
-; php_admin_flag[mail.add_x_header] = Off
-
-; Other common parameters
-; php_admin_value[max_execution_time] = 600
-; php_admin_value[max_input_time] = 300
-; php_admin_value[memory_limit] = 256M
-; php_admin_flag[short_open_tag] = On
diff --git a/conf/sqlite.src b/conf/sqlite.src
deleted file mode 100644
index 02d4c2f..0000000
--- a/conf/sqlite.src
+++ /dev/null
@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/2.0.33.tar.gz
-SOURCE_SUM=9cad2555eb115711e100ca129c8152f3ec19ebfde6334a1ec5b7b2009b011959
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 7b6c6bd..2908388 100755
--- a/scripts/install
+++ b/scripts/install
@@ -105,7 +105,7 @@ setfacl -R -m g:"www-data":rwX -m u:$app:rwX "$final_path/var/"
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index b5a8937..c6dd505 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -113,7 +113,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --source_id="$database" --keep="config/packages/local.yaml var/invoices/ var/data/"
+	ynh_setup_source --dest_dir="$final_path" --keep="config/packages/local.yaml var/invoices/ var/data/"
 fi
 
 chmod 750 "$final_path"
@@ -135,7 +135,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================

From 6317e6e6e82561c34a6ceedaf302fa828bc27e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 15:17:14 +0200
Subject: [PATCH 02/26] fix

---
 scripts/install | 2 +-
 scripts/upgrade | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 2908388..3e7e6f1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -150,7 +150,7 @@ chmod 400 "$final_path/config/packages/local.yaml"
 chown $app:$app "$final_path/config/packages/local.yaml"
 
 # Configure environement
-ynh_add_config --template="../conf/.env.$database" --destination="$final_path/.env"
+ynh_add_config --template="../conf/.env" --destination="$final_path/.env"
 
 chmod 400 "$final_path/.env"
 chown $app:$app "$final_path/.env"
diff --git a/scripts/upgrade b/scripts/upgrade
index c6dd505..404da91 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -180,7 +180,7 @@ chmod 400 "$final_path/config/packages/local.yaml"
 chown $app:$app "$final_path/config/packages/local.yaml"
 
 # Configure environement
-ynh_add_config --template="../conf/.env.$database" --destination="$final_path/.env"
+ynh_add_config --template="../conf/.env" --destination="$final_path/.env"
 
 chmod 400 "$final_path/.env"
 chown $app:$app "$final_path/.env"

From 977adc8e8ea3c57878ae52d8dbfd2c32c3265725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 15:52:26 +0200
Subject: [PATCH 03/26] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 3e7e6f1..7ff2b0a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -91,7 +91,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path" --source_id="$database"
+ynh_setup_source --dest_dir="$final_path"
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"

From be3756a8282d5c16723450d81fff53263eb3dd76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 16:00:44 +0200
Subject: [PATCH 04/26] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 5a8edbd..ac5df09 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 # PHP APP SPECIFIC
 #=================================================
 
-YNH_PHP_VERSION=7.4
+YNH_PHP_VERSION=8.2
 
 YNH_COMPOSER_VERSION=2.3.3
 

From cf1b8675ea6419310aaa7b108b72464eb8fcc319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 16:53:36 +0200
Subject: [PATCH 05/26] Update upgrade

---
 scripts/upgrade | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 404da91..d46766b 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -153,8 +153,8 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
-ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" --install_args="--optimize-autoloader"
-ynh_composer_exec --phpversion="$phpversion" --workdir="$final_path" --commands="require laminas/laminas-ldap"
+ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader"
+ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
@@ -190,14 +190,10 @@ chown $app:$app "$final_path/.env"
 #=================================================
 ynh_script_progression --message="Installing Kimai2..." --weight=1
 
-update-alternatives --set php /usr/bin/php$phpversion
-
 pushd "$final_path"
-	ynh_exec_as $app php$phpversion bin/console kimai:update -n
+	ynh_exec_as $app php$YNH_PHP_VERSION bin/console kimai:update -n
 popd
 
-update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION}
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================

From 6b806f609bbfc51fcfeb1eb1921da668f4d59d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 17:59:00 +0200
Subject: [PATCH 06/26] Update upgrade

---
 scripts/upgrade | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index d46766b..511f98a 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -114,6 +114,9 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --keep="config/packages/local.yaml var/invoices/ var/data/"
+	pushd "$final_path"
+		ynh_exec_as $app php$YNH_PHP_VERSION bin/console cache:clear --env=prod
+		popd
 fi
 
 chmod 750 "$final_path"

From 81860ac58862fb23e10150c0915becbf3c0e39f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 18:00:51 +0200
Subject: [PATCH 07/26] Update upgrade

---
 scripts/upgrade | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 511f98a..9c0d412 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -116,7 +116,9 @@ then
 	ynh_setup_source --dest_dir="$final_path" --keep="config/packages/local.yaml var/invoices/ var/data/"
 	pushd "$final_path"
 		ynh_exec_as $app php$YNH_PHP_VERSION bin/console cache:clear --env=prod
-		popd
+	popd
+
+	#ynh_secure_remove --file="$final_path/var/cache/prod"
 fi
 
 chmod 750 "$final_path"

From 1f63ff40263a86415ebe6b3c7c477a3649dea92e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 19:06:24 +0200
Subject: [PATCH 08/26] Update upgrade

---
 scripts/upgrade | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 9c0d412..fbb7cb9 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -114,11 +114,6 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --keep="config/packages/local.yaml var/invoices/ var/data/"
-	pushd "$final_path"
-		ynh_exec_as $app php$YNH_PHP_VERSION bin/console cache:clear --env=prod
-	popd
-
-	#ynh_secure_remove --file="$final_path/var/cache/prod"
 fi
 
 chmod 750 "$final_path"
@@ -159,8 +154,13 @@ ynh_add_nginx_config
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
 ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader"
+	pushd "$final_path"
+		ynh_exec_as $app php$YNH_PHP_VERSION bin/console cache:clear --env=prod
+	popd
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
+#ynh_secure_remove --file="$final_path/var/cache/prod"
+
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

From 2ca0d587707d80a722913115ff8e97a12ff61f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Sep 2023 20:55:30 +0200
Subject: [PATCH 09/26] Update upgrade

---
 scripts/upgrade | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index fbb7cb9..ccca4da 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -153,14 +153,10 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
+ynh_secure_remove --file="$final_path/var/cache/prod"
 ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader"
-	pushd "$final_path"
-		ynh_exec_as $app php$YNH_PHP_VERSION bin/console cache:clear --env=prod
-	popd
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
-#ynh_secure_remove --file="$final_path/var/cache/prod"
-
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

From 26b1b8c61828fe7b0426280f8eadbe54631289bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 08:22:58 +0200
Subject: [PATCH 10/26] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ac5df09..78dc385 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,7 +8,7 @@
 
 YNH_PHP_VERSION=8.2
 
-YNH_COMPOSER_VERSION=2.3.3
+YNH_COMPOSER_VERSION=2.5.8
 
 php_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-xsl php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-sqlite3"
 

From 262343e3c1e237ff82d4d97d7ce56172a14e70e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 09:23:26 +0200
Subject: [PATCH 11/26] Revert "Update _common.sh"

This reverts commit 26b1b8c61828fe7b0426280f8eadbe54631289bd.
---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 78dc385..ac5df09 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,7 +8,7 @@
 
 YNH_PHP_VERSION=8.2
 
-YNH_COMPOSER_VERSION=2.5.8
+YNH_COMPOSER_VERSION=2.3.3
 
 php_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-xsl php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-sqlite3"
 

From fa8b6fda2788f374b0bd1f2edd40bab0f016f7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 11:47:14 +0200
Subject: [PATCH 12/26] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index ccca4da..8403df7 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -154,7 +154,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
 ynh_secure_remove --file="$final_path/var/cache/prod"
-ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader"
+ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-scripts"
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
 chmod 750 "$final_path"

From eb80851c8695e14ae8941fc94c2210d300fbe8c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 11:54:09 +0200
Subject: [PATCH 13/26] Update .env

---
 conf/.env | 44 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/conf/.env b/conf/.env
index 30b9315..68d97ba 100644
--- a/conf/.env
+++ b/conf/.env
@@ -1,21 +1,47 @@
-# Configure your database connection and set the correct server version:
-# for MySQL "serverVersion=5.7" and for MariaDB "serverVersion=mariadb-10.5.8"
+#
+# You should NOT use this file in production, but instead move the environment variables to your webserver configuration.
+# The .env file is only existing to simplify the initial setup!
+#
+
+#================================================================================
+# Configure your database connection and set the correct server version.
+#
+# You have to replace the following values with your defaults:
+# - the version "5.7" (the database server version, examples for MySQL and MariaDB below)
+# - the database username "user"
+# - the password "password" for "user"
+# - the database schema "database"
+# - you might have to adapt port "3306" and server IP "127.0.0.1" as well
+#
+# For MySQL that would be "serverVersion=5.7" as in:
+#    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=5.7
+#
+# For MariaDB it would be "serverVersion=mariadb-10.5.8":
+#    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=mariadb-10.5.8
+#
 DATABASE_URL=mysql://__DB_USER__:__DB_PWD__@127.0.0.1:3306/__DB_NAME__?charset=utf8&serverVersion=mariadb-10.5.12
 
-# Email will be sent with this address as sender
+#================================================================================
+# The full documentation can be found at https://www.kimai.org/documentation/emails.html
+#
+# Email will be sent with this address as sender:
 MAILER_FROM=admin@__DOMAIN__
-# Email connection (disabled by default) more info at https://www.kimai.org/documentation/emails.html
+# Email connection (disabled by default) - see documentation for the format
 MAILER_URL=smtp://localhost:25?encryption=&auth_mode=
 
+#================================================================================
 # do not change, unless you are developing for Kimai
 APP_ENV=prod
 
-# should be changed to a unique character sequence
+#================================================================================
+# should be changed to a unique character sequence, used for hashing cookies
 APP_SECRET=__RANDOM_KEY__
 
-# unlikely, that you need to change this one
-CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$
-
-# Running behind reverse proxies? Use those:
+#================================================================================
+# Running behind reverse proxies? Try these:
 TRUSTED_PROXIES=127.0.0.1
 TRUSTED_HOSTS=localhost,__DOMAIN__
+
+#================================================================================
+# unlikely, that you need to change this one
+CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$

From 5ae0af2b529eedeb3d98f31cdc79d6d4684cd41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 13:29:28 +0200
Subject: [PATCH 14/26] Update _common.sh

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index ac5df09..65431ab 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 # PHP APP SPECIFIC
 #=================================================
 
-YNH_PHP_VERSION=8.2
+YNH_PHP_VERSION=8.1
 
 YNH_COMPOSER_VERSION=2.3.3
 

From e0294e1d7913990207c028322893cd489abd7796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 13:31:48 +0200
Subject: [PATCH 15/26] Update nginx.conf

---
 conf/nginx.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 8c7ad9e..8a01591 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -6,9 +6,10 @@ location __PATH__/ {
   index index.php;
 
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
-  #client_max_body_size 50M;
+  client_max_body_size 50M;
 
   try_files $uri $uri/ /index.php$is_args$args;
+
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;

From caf6e28cf61c981daf629194b9719c26cbe46e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 13:33:24 +0200
Subject: [PATCH 16/26] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 65d3107..9a5835a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -30,7 +30,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.4-fpm",
+        "php8.1-fpm",
         "mysql"
     ],
     "arguments": {

From 043dab9a7abdb6a38b79a6db807bfbcb3c487b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 13:54:01 +0200
Subject: [PATCH 17/26] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 7ff2b0a..62d53a3 100755
--- a/scripts/install
+++ b/scripts/install
@@ -123,7 +123,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
-ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" --install_args="--optimize-autoloader"
+ynh_install_composer --phpversion="$phpversion" --workdir="$final_path" --install_args="--optimize-autoloader --no-interaction"
 ynh_composer_exec --phpversion="$phpversion" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
 chmod 750 "$final_path"

From de2372bb9843422fbd96aab310a384f7dfc13dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 13:59:23 +0200
Subject: [PATCH 18/26] Update upgrade

---
 scripts/upgrade | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8403df7..83648d3 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -113,7 +113,9 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="config/packages/local.yaml var/invoices/ var/data/"
+	ynh_setup_source --dest_dir="$final_path" --keep="var/invoices/ var/data/" #config/packages/local.yaml
+
+	ynh_secure_remove --file="$final_path/var/plugins/*"
 fi
 
 chmod 750 "$final_path"
@@ -153,7 +155,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
-ynh_secure_remove --file="$final_path/var/cache/prod"
+ynh_secure_remove --file="$final_path/var/cache/prod/*"
 ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-scripts"
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 

From b816199dc5e5789780eac49abc2ea887c4c4d3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:02:23 +0200
Subject: [PATCH 19/26] Update .env

---
 conf/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/.env b/conf/.env
index 68d97ba..ef481cc 100644
--- a/conf/.env
+++ b/conf/.env
@@ -19,7 +19,7 @@
 # For MariaDB it would be "serverVersion=mariadb-10.5.8":
 #    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=mariadb-10.5.8
 #
-DATABASE_URL=mysql://__DB_USER__:__DB_PWD__@127.0.0.1:3306/__DB_NAME__?charset=utf8&serverVersion=mariadb-10.5.12
+DATABASE_URL=mysql://__DB_USER__:__DB_PWD__@127.0.0.1:3306/__DB_NAME__?charset=utf8mb4&serverVersion=mariadb-10.5.19
 
 #================================================================================
 # The full documentation can be found at https://www.kimai.org/documentation/emails.html

From 2e9207c9bf5a06844f1faeb917d85a8f0f738d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:23:36 +0200
Subject: [PATCH 20/26] Update check_process

---
 check_process | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/check_process b/check_process
index 12002d4..c2aad8a 100644
--- a/check_process
+++ b/check_process
@@ -1,4 +1,4 @@
-;; Test complet mysql
+;; Test complet
 	; Manifest
 		domain="domain.tld"
 		is_public=1
@@ -14,7 +14,7 @@
 		setup_public=1
 		upgrade=1
 		# 1.30.0~ynh1
-		upgrade=1	from_commit=d073ffb8db7e416f0f1d0f645c6e77a9f11e10b9
+		upgrade=1	from_commit=8f44ac8fd4276c402c3cf68e373a6a3ff51e25b5
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0

From 9deb617f13cc58b12a0f98cc478c892cbddfebb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:27:04 +0200
Subject: [PATCH 21/26] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 83648d3..a111889 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -116,6 +116,7 @@ then
 	ynh_setup_source --dest_dir="$final_path" --keep="var/invoices/ var/data/" #config/packages/local.yaml
 
 	ynh_secure_remove --file="$final_path/var/plugins/*"
+	ynh_secure_remove --file="$final_path/var/cache/prod/*"
 fi
 
 chmod 750 "$final_path"
@@ -155,7 +156,6 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building Kimai2..." --weight=1
 
-ynh_secure_remove --file="$final_path/var/cache/prod/*"
 ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-scripts"
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 

From eb83b27faeaa44bf1268d09b0573658fca6d7595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 14:28:02 +0200
Subject: [PATCH 22/26] Update upgrade

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a111889..3d8973a 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -154,7 +154,7 @@ ynh_add_nginx_config
 #=================================================
 # BUILD KIMAI2
 #=================================================
-ynh_script_progression --message="Building Kimai2..." --weight=1
+ynh_script_progression --message="Building $app..." --weight=1
 
 ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-scripts"
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
@@ -191,7 +191,7 @@ chown $app:$app "$final_path/.env"
 #=================================================
 # INSTALL KIMAI2
 #=================================================
-ynh_script_progression --message="Installing Kimai2..." --weight=1
+ynh_script_progression --message="Installing $app..." --weight=1
 
 pushd "$final_path"
 	ynh_exec_as $app php$YNH_PHP_VERSION bin/console kimai:update -n

From eda3f0004b1fc71eb5ab39513f584f6674540f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:18:36 +0200
Subject: [PATCH 23/26] Update upgrade

---
 scripts/upgrade | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3d8973a..c1a596c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -114,9 +114,6 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path" --keep="var/invoices/ var/data/" #config/packages/local.yaml
-
-	ynh_secure_remove --file="$final_path/var/plugins/*"
-	ynh_secure_remove --file="$final_path/var/cache/prod/*"
 fi
 
 chmod 750 "$final_path"
@@ -156,7 +153,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Building $app..." --weight=1
 
-ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-scripts"
+ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-interaction"
 ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
 chmod 750 "$final_path"

From aa56f4b380cadf1e3e20fef9fa83ffe8e2e14f41 Mon Sep 17 00:00:00 2001
From: eric_G <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 11 Sep 2023 14:26:42 +0200
Subject: [PATCH 24/26] Update scripts/install

Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 62d53a3..41a5c84 100755
--- a/scripts/install
+++ b/scripts/install
@@ -105,7 +105,7 @@ setfacl -R -m g:"www-data":rwX -m u:$app:rwX "$final_path/var/"
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================

From 030b732c8236214b56c5b287db6068ce4225aa7c Mon Sep 17 00:00:00 2001
From: eric_G <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 11 Sep 2023 14:26:50 +0200
Subject: [PATCH 25/26] Update scripts/upgrade

Co-authored-by: Alexandre Aubin <alex.aubin@mailoo.org>
---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index c1a596c..004dd39 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -135,7 +135,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================

From 3874a1bbf45b95827b36529f21f0165c1a2c80f6 Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:34:12 +0100
Subject: [PATCH 26/26] Fix upgrading (#80)

* Auto-update README

* Update local.yaml

Remove duplicate security block

* Update upgrade

Doing a hard cache flush for major upgrade

* Update upgrade

Fix syntax

* Update upgrade

Use ynh_secure_remove

* Update upgrade

Remove local.yaml for major version upgrade

* Update upgrade

No loading from cache for major upgrade

* Update upgrade

Do full replace for setup sources when major upgrade

* Update upgrade

Fix full_replace arg

* Update upgrade

cleaning

* Update upgrade

Remove obsolete source_id

---------

Co-authored-by: yunohost-bot <yunohost@yunohost.org>
---
 README.md       |  2 +-
 README_fr.md    |  2 +-
 conf/local.yaml |  8 --------
 scripts/upgrade | 18 ++++++++++++++----
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 388baa8..9feb219 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ Those roles are directly managed using YunoHost permission system. User choosen
 * Official app website: <https://www.kimai.org>
 * Official admin documentation: <https://www.kimai.org/documentation/>
 * Upstream app code repository: <https://github.com/kevinpapst/kimai2>
-* YunoHost documentation for this app: <https://yunohost.org/app_kimai2>
+* YunoHost Store: <https://apps.yunohost.org/app/kimai2>
 * Report a bug: <https://github.com/YunoHost-Apps/kimai2_ynh/issues>
 
 ## Developer info
diff --git a/README_fr.md b/README_fr.md
index ce4d9bc..0b65d70 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -51,7 +51,7 @@ Those roles are directly managed using YunoHost permission system. User choosen
 * Site officiel de l’app : <https://www.kimai.org>
 * Documentation officielle de l’admin : <https://www.kimai.org/documentation/>
 * Dépôt de code officiel de l’app : <https://github.com/kevinpapst/kimai2>
-* Documentation YunoHost pour cette app : <https://yunohost.org/app_kimai2>
+* YunoHost Store: <https://apps.yunohost.org/app/kimai2>
 * Signaler un bug : <https://github.com/YunoHost-Apps/kimai2_ynh/issues>
 
 ## Informations pour les développeurs
diff --git a/conf/local.yaml b/conf/local.yaml
index 8bd091a..b4c04cb 100644
--- a/conf/local.yaml
+++ b/conf/local.yaml
@@ -1,11 +1,3 @@
-security:
-    providers:
-        chain_provider:
-            chain:
-                providers: [kimai_ldap]
-    firewalls:
-        secured_area:
-            kimai_ldap: ~
 kimai:
     user:
         registration: __REGISTRATION__
diff --git a/scripts/upgrade b/scripts/upgrade
index 004dd39..fca96d9 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -37,7 +37,7 @@ upgrade_type=$(ynh_check_app_version_changed)
 if [ "$database" == "sqlite" ]
 then
 	ynh_script_progression --message="Sqlite is not more supported by Kimai2..."
-	ynh_script_progression --message="Kimai2 will be upgrade to last available version : 1.13"
+	ynh_script_progression --message="Kimai2 will be upgraded to last available version : 1.13"
 	if ynh_compare_current_package_version --comparison ge --version 1.17.1~ynh1
 	then
     	ynh_script_progression --message="Kimai2 sqlite version is already to the last available version, no upgrade will be made"
@@ -112,8 +112,18 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="var/invoices/ var/data/" #config/packages/local.yaml
+	if ynh_compare_current_package_version --comparison le --version 1.30.0~ynh1
+	then
+		ynh_script_progression --message="Doing a hard cache flush for major Kimai 2 update from version 1.x to 2.x"
+		
+		# Download, check integrity, uncompress and patch the source from app.src
+		# Remove local.yaml as recommended for major version upgrade https://github.com/kimai/kimai/blob/main/UPGRADING.md
+		# As a full_replace (see https://www.kimai.org/documentation/updates.html) is performed keep .env file
+		ynh_setup_source --dest_dir="$final_path" --keep=".env var/invoices/ var/data/" --full_replace=1
+	else
+		# Download, check integrity, uncompress and patch the source from app.src
+		ynh_setup_source --dest_dir="$final_path" --keep="config/packages/local.yaml var/invoices/ var/data/"
+	fi
 fi
 
 chmod 750 "$final_path"
@@ -154,7 +164,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Building $app..." --weight=1
 
 ynh_install_composer --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --install_args="--optimize-autoloader --no-interaction"
-ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap"
+ynh_composer_exec --phpversion="$YNH_PHP_VERSION" --workdir="$final_path" --commands="require laminas/laminas-ldap --optimize-autoloader"
 
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"