From bfa98b2287ff07ee08f3e4ce254a9c1d9717fd16 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 18 Apr 2020 06:01:21 +0200 Subject: [PATCH 01/31] Apply example_ynh --- README.md | 55 ++++-- check_process | 15 +- conf/{.env => .env.mysql} | 24 ++- conf/.env.sqlite | 24 ++- conf/app.src | 8 +- conf/local.yaml | 157 +++++++++++++++ conf/message | 8 + conf/nginx.conf | 22 ++- conf/php-fpm.conf | 69 +++++-- manifest.json | 28 +-- pull_request_template.md | 18 ++ scripts/_common.sh | 215 ++------------------ scripts/backup | 41 ++-- scripts/install | 228 ++++++++++----------- scripts/remove | 55 ++++-- scripts/restore | 108 +++++----- scripts/upgrade | 274 +++++++++++++------------- scripts/ynh_add_extra_apt_repos__3 | 294 ++++++++++++++++++++++++++++ scripts/ynh_install_php__3 | 78 ++++++++ scripts/ynh_send_readme_to_admin__2 | 140 +++++++++++++ 20 files changed, 1231 insertions(+), 630 deletions(-) rename conf/{.env => .env.mysql} (70%) create mode 100644 conf/message create mode 100644 pull_request_template.md create mode 100644 scripts/ynh_add_extra_apt_repos__3 create mode 100644 scripts/ynh_install_php__3 create mode 100644 scripts/ynh_send_readme_to_admin__2 diff --git a/README.md b/README.md index 3ea8945..448497c 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,26 @@ -# Kimai 2 app for YunoHost +# Kimai2 app for YunoHost -[![Integration level](https://dash.yunohost.org/integration/kimai2.svg)](https://ci-apps.yunohost.org/jenkins/job/kimai2%20%28Community%29/lastBuild/consoleFull) -[![Install kimai2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=kimai2)
+[![Integration level](https://dash.yunohost.org/integration/kimai2.svg)](https://dash.yunohost.org/appci/app/kimai2) +[![Install kimai2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=kimai2) -Shipped Version: **0.8.1 (pre-release)** - -**Please note that this app will install PHP 7.2** - -- [YunoHost project](https://yunohost.org) -- [Kimai 2](https://v2.kimai.org) -- [Kimai 2 source code at Github](https://github.com/kevinpapst/kimai2) - -## Introduction +> *This package allow you to install kimai2 quickly and simply on a YunoHost server. +If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +## Overview This is the reloaded version of the open source timetracker Kimai. Right now its in an early development phase, its usable but some advanced features from Kimai v1 are missing by now. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). +https://github.com/kevinpapst/kimai2 -## Installation +Shipped Version: **0.8.1 (pre-release)** + +## Screenshots + +![](https://www.kimai.org/images/screenshots/time-tracking.png) + +## Demo + +* [Official demo](https://www.kimai.org/demo/) ### Guidelines @@ -31,3 +34,29 @@ Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic i $ sudo yunohost app install https://github.com/YunoHost-Apps/kimai2_ynh 1. Login details will be sent to the admin email. + +#### Supported architectures + +* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/kimai2%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/kimai2/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/kimai2%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/kimai2/) + +## Links + + * Report a bug: https://github.com/YunoHost-Apps/kimai2_ynh/issues + * App website: https://www.kimai.org/ + * Upstream app repository: https://github.com/kevinpapst/kimai2 + * YunoHost website: https://yunohost.org/ + +--- + +Developers info +---------------- + +Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/kimai2_ynh/tree/testing). + +To try the testing branch, please proceed like that. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/kimai2_ynh/tree/testing --debug +or +sudo yunohost app upgrade kimai2 -u https://github.com/YunoHost-Apps/kimai2_ynh/tree/testing --debug +``` diff --git a/check_process b/check_process index cb0e356..245e6ec 100644 --- a/check_process +++ b/check_process @@ -20,22 +20,13 @@ upgrade=1 backup_restore=1 multi_instance=1 - incorrect_path=1 + # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. + # incorrect_path=1 port_already_use=0 change_url=0 ;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto -# No ldap support implimented by core app yet - Level 4=na -# Level 5: + # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Options Email=anmol@datamol.org Notification=change diff --git a/conf/.env b/conf/.env.mysql similarity index 70% rename from conf/.env rename to conf/.env.mysql index c28ff3a..6c6ff45 100644 --- a/conf/.env +++ b/conf/.env.mysql @@ -2,10 +2,6 @@ # Copy this file to .env file for development, create environment variables when deploying to production # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration -# KIMAI DEFAULT ENV VARS -DATABASE_PREFIX=kimai2_ -MAILER_FROM=admin@__DOMAIN__ - ###> symfony/framework-bundle ### APP_ENV=prod APP_SECRET=__RANDOM_KEY__ @@ -17,13 +13,23 @@ APP_SECRET=__RANDOM_KEY__ # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data/kimai.sqlite" # Configure your db driver and server_version in config/packages/doctrine.yaml +DATABASE_PREFIX=kimai2_ DATABASE_URL=mysql://__DB_USER__:__DB_PASSWORD__@127.0.0.1:3306/__DB_NAME__ # DATABASE_URL=sqlite:///%kernel.project_dir%/var/data/kimai.sqlite ###< doctrine/doctrine-bundle ### -###> symfony/swiftmailer-bundle ### -# For Gmail as a transport, use: "gmail://username:password@localhost" -# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode=" -# Delivery is disabled by default via "null://localhost" +###> nelmio/cors-bundle ### +CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$ +###< nelmio/cors-bundle ### + +### Email configuration +# SMTP: smtp://localhost:25?encryption=&auth_mode= +# Google: gmail://username:password@default +# Amazon: ses://ACCESS_KEY:SECRET_KEY@default?region=eu-west-1 +# Mailchimp: mandrill://KEY@default +# Mailgun: mailgun://KEY:DOMAIN@default +# Postmark: postmark://ID@default +# Sendgrid: sendgrid://KEY@default +# Disable emails: null://null MAILER_URL=smtp://localhost:25?encryption=&auth_mode= -###< symfony/swiftmailer-bundle ### +MAILER_FROM=admin@__DOMAIN__ diff --git a/conf/.env.sqlite b/conf/.env.sqlite index 6ca9be9..b33403b 100644 --- a/conf/.env.sqlite +++ b/conf/.env.sqlite @@ -2,10 +2,6 @@ # Copy this file to .env file for development, create environment variables when deploying to production # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration -# KIMAI DEFAULT ENV VARS -DATABASE_PREFIX=kimai2_ -MAILER_FROM=admin@__DOMAIN__ - ###> symfony/framework-bundle ### APP_ENV=prod APP_SECRET=__RANDOM_KEY__ @@ -18,12 +14,22 @@ APP_SECRET=__RANDOM_KEY__ # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data/kimai.sqlite" # Configure your db driver and server_version in config/packages/doctrine.yaml # DATABASE_URL=mysql://__DB_USER__:__DB_PASSWORD__@127.0.0.1:3306/__DB_NAME__ +DATABASE_PREFIX=kimai2_ DATABASE_URL=sqlite:///%kernel.project_dir%/var/data/kimai.sqlite ###< doctrine/doctrine-bundle ### -###> symfony/swiftmailer-bundle ### -# For Gmail as a transport, use: "gmail://username:password@localhost" -# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode=" -# Delivery is disabled by default via "null://localhost" +###> nelmio/cors-bundle ### +CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$ +###< nelmio/cors-bundle ### + +### Email configuration +# SMTP: smtp://localhost:25?encryption=&auth_mode= +# Google: gmail://username:password@default +# Amazon: ses://ACCESS_KEY:SECRET_KEY@default?region=eu-west-1 +# Mailchimp: mandrill://KEY@default +# Mailgun: mailgun://KEY:DOMAIN@default +# Postmark: postmark://ID@default +# Sendgrid: sendgrid://KEY@default +# Disable emails: null://null MAILER_URL=smtp://localhost:25?encryption=&auth_mode= -###< symfony/swiftmailer-bundle ### +MAILER_FROM=admin@__DOMAIN__ diff --git a/conf/app.src b/conf/app.src index c0ea0b9..5d4b0d5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/0.8.1.tar.gz -SOURCE_SUM=6f156bf510f9fec540e49128392dbd2f9f569a2de6d9aed7174e4044bde39b2b +SOURCE_URL=https://github.com/kevinpapst/kimai2/releases/download/1.8/kimai-release-1.8.zip +SOURCE_SUM=c4de84b78102d30e858746f107839fe4144c80a31bbfb84e8476f95258be1c0c SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true +SOURCE_FORMAT=zip +SOURCE_IN_SUBDIR=false SOURCE_FILENAME= diff --git a/conf/local.yaml b/conf/local.yaml index 42dc5a7..af25095 100644 --- a/conf/local.yaml +++ b/conf/local.yaml @@ -1,3 +1,160 @@ +security: + providers: + chain_provider: + chain: + providers: [kimai_ldap] + firewalls: + secured_area: + kimai_ldap: ~ kimai: user: registration: __REGISTRATION__ + ldap: + # more infos about the connection params can be found at: + # https://docs.laminas.dev/laminas-ldap/api/ + connection: + # The default hostname of the LDAP server (mandatory setting). + # You can connect to multiple servers by setting their URLs like this: + # host: "ldap://ldap.example.local ldap://ldap2.example.local" + # host: "ldaps://ldap.example.local ldaps://ldap2.example.local" + host: 127.0.0.1 + + # Default port for your LDAP port server + # default: 389 + #port: 389 + + # Whether or not the LDAP client should use SSL encrypted transport. + # The useSsl and useStartTls options are mutually exclusive. + # default: false + #useSsl: false + + # Enable TLS negotiation (should be favoured over useSsl). + # The useSsl and useStartTls options are mutually exclusive. + # default: false + #useStartTls: false + + # The default credentials username (your service account). Some servers + # require that this is given in DN form. + # It must be given in DN form if the LDAP server requires + # a DN to bind and binding should be possible with simple usernames. + # default: empty + #username: + + # Password for the username (service-account) above + # default: empty + #password: + + # LDAP search filter to find the user (%s will be replaced by the username). + # Should be set, to be compatible with your object structure. + # You don not need to set this filter, unless you have a very special setup + # or use Microsofts Active directory. + # + # Defaults: + # - if bindRequiresDn is false: (&(objectClass=user)(sAMAccountName=%s)) + # - if bindRequiresDn is true: (&%filter%(uid=%s)) + # - %filter% = empty + # accountFilterFormat = (&(usernameAttribute=%s)) + # - %filter% = (&(objectClass=posixAccount)) + # accountFilterFormat = (&(objectClass=posixAccount))(&(usernameAttribute=%s)) + # + # %filter% is the "filter" configuration defined below in the "user" section + #accountFilterFormat: (&(objectClass=inetOrgPerson)(uid=%s)) + + # If true, this instructs Kimai to retrieve the DN for the account, + # used to bind if the username is not already in DN form. + # default: true + #bindRequiresDn: true + + # If set to true, this option indicates to the LDAP client that + # referrals should be followed, default: false + #optReferrals: false + + # for the next options please refer to: + # https://docs.laminas.dev/laminas-ldap/api/ + #allowEmptyPassword: false + #tryUsernameSplit: + #networkTimeout: + #accountCanonicalForm: 3 + #accountDomainName: HOST + #accountDomainNameShort: HOST + + user: + # baseDn to query for users (mandatory setting). + baseDn: ou=users, dc=yunohost, dc=org + + # Field used to match the login username in your LDAP. + # If "bindRequiresDn: false" is set, the username is used in "bind". + # Otherwise a search is executed to find the users "dn" by finding the user + # via this attribute with his "baseDn" and the "filter" below. + # default: uid + usernameAttribute: uid + + # LDAP search base filter to find the user / the users DN. + # Do NOT include the rule (&(usernameAttribute=%s)), it will be appended + # automatically. The result of the search filter must return 1 result only. + # default: empty (results in (&(uid=%s)) with default usernameAttribute) + filter: (&(objectClass=inetOrgPerson)) + + # LDAP search base filter to find the user attributes. + # This is used for a slightly different query than the one above, which is + # used to query the users DN only. + # AD users might have too many results (Exchange activesync devices + # attributes) and therefor an incompatible result structure if not changed. + # See https://github.com/kevinpapst/kimai2/issues/875 + # default: (objectClass=*) + #attributesFilter: (objectClass=Person) + + # Configure the mapping between LDAP attributes and user entity + # The ldap_attr must be given in lowercase! + attributes: + # The following 2 rules are automatically prepended and can be overwritten. + # Username is set to the value of the configured "usernameAttribute" field + - { ldap_attr: "usernameAttribute", user_method: setUsername } + # Only applied if you don't configure a mapping for setEmail() + - { ldap_attr: "usernameAttribute", user_method: setEmail } + # An example which will set the display name in Kimai from the + # value of the "common name" field in your LDAP + - { ldap_attr: cn, user_method: setAlias } + + # You can comment the following section, if you don't want to manage + # user roles in Kimai via LDAP groups. If you want to use the group + # sync, you have to set at least the "role.baseDn" config. + # default: deactivated as "role.baseDn" is empty by default + role: + # baseDn to query for groups, MUST be set to activate the "group import" + # default: empty (deactivated) + baseDn: ou=groups, dc=kimai, dc=org + + # Filter to query user groups, all results will be matched against + # the configured "groups" mapping below. + # The full search filter will ALWAYS be generated like this: + # (&%filter(userDnAttribute=valueOfUsernameAttribute)) + # The following example rule will be expanded to (for user "foo"): + # (&(&(objectClass=groupOfNames))(member=foo)) + # default: empty + filter: (&(objectClass=groupOfNames)) + + # The following field is taken from the LDAP user entry and its + # value is used in the filter above as "valueOfUsernameAttribute". + # The attribute must be given in lowercase! + # The example below uses "posix group style memberUid". + # default: dn + #usernameAttribute: uid + + # Field that holds the group name, which will be used to map the + # LDAP groups with Kimai roles (see groups mapping below). + # default: cn + #nameAttribute: cn + + # Field that holds the users dn in your LDAP group definition. + # Value of this configuration is used in the filter (see above). + # default: member + #userDnAttribute: member + + # Convert LDAP group name (nameAttribute) to Kimai role + # You will very likely have to define mappings, unless your groups + # are called "teamlead", "admin" or "super_admin" + #groups: + # - { ldap_value: group1, role: ROLE_TEAMLEAD } + # - { ldap_value: kimai_admin, role: ROLE_ADMIN } + diff --git a/conf/message b/conf/message new file mode 100644 index 0000000..a5b743c --- /dev/null +++ b/conf/message @@ -0,0 +1,8 @@ +__APP__ was successfully installed :) + +Please open your __APP__ domain: https://__DOMAIN____PATH_URL__ + +The admin username is: __ADMIN_EMAIL__ +The admin password is: __ADMIN_PASS__ + +If you facing any issue or want to improve the app, please open a new issue on the project page: https://github.com/YunoHost-Apps/kimai2_yn \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index f74d5e0..5a98c4f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,22 +1,34 @@ +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location ^~ __PATH__ { + + # Path to source alias __FINALPATH__/public/; -try_files $uri $uri/ @kimai; -index index.php index.htm index.html; - # Force https + + # Force usage of https if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } + + index index.php index.htm index.html; + + # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file + #client_max_body_size 50M; + + try_files $uri $uri/ @kimai; location ~ \.php { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php7.2-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php/php7.3-fpm-__NAME__.sock; + fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } -} + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; +} location @kimai { rewrite /(.*)$ /index.php?/$1 last; diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 86aeeef..db3ac1d 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -1,10 +1,11 @@ ; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the +; 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' @@ -24,17 +25,19 @@ 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 address on +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on ; a specific port; -; 'port' - to listen on a TCP socket to all addresses 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/php7.2-fpm-__NAMETOCHANGE__.sock +listen = /var/run/php/php7.3-fpm-__NAMETOCHANGE__.sock -; Set listen(2) backlog. A value of '-1' means unlimited. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 128 +; 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 @@ -44,8 +47,13 @@ listen = /var/run/php7.2-fpm-__NAMETOCHANGE__.sock 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 ipv4 addresses of FastCGI clients which are allowed to connect. +; 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 @@ -59,7 +67,13 @@ listen.group = www-data ; - The pool processes will inherit the master process priority ; unless it specified otherwise ; Default Value: no set -; priority = -19 +; 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: @@ -215,7 +229,7 @@ pm.max_requests = 500 ; last request memory: 0 ; ; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: ${prefix}/share/fpm/status.html +; It's available in: /usr/share/php/7.3/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 @@ -275,7 +289,7 @@ pm.max_requests = 500 ; - %{megabytes}M ; - %{mega}M ; %n: pool name -; %o: ouput header +; %o: output header ; it must be associated with embraces to specify the name of the header: ; - %{Content-Type}o ; - %{X-Powered-By}o @@ -291,9 +305,13 @@ pm.max_requests = 500 ; %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 %{}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 %{}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" @@ -340,7 +358,7 @@ request_terminate_timeout = 1d ; Chdir to this directory at the start. ; Note: relative path can be used. ; Default Value: current directory or / when chroot -chdir = __FINALPATH__ +chdir = __FINALPATH__/public ; 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. @@ -349,14 +367,23 @@ chdir = __FINALPATH__ ; 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 -; exectute php code. +; execute php code. ; Note: set an empty value to allow all extensions. ; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 - +;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 @@ -391,3 +418,13 @@ catch_workers_output = yes ;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/manifest.json b/manifest.json index 66f15cc..7fe8436 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ "de": "Eine web-basierte Mehrbenutzer-Zeiterfassung mit Rechnungsdruck mit Unterstützung für mobile Endgeräte", "cs": "Víceuživatelská webová aplikace pro sledování času s podporou mobilních zařízení" }, - "version": "0.8.1", + "version": "0.8.1~ynh1", "url": "https://v2.kimai.org", "license": "MIT", "maintainer": { @@ -17,12 +17,12 @@ "url": "datamol.org" }, "requirements": { - "yunohost": ">= 2.7.2" + "yunohost": ">= 3.5" }, "multi_instance": true, "services": [ "nginx", - "php7.2-fpm", + "php7.0-fpm", "mysql" ], "arguments": { @@ -49,6 +49,17 @@ }, "example": "johndoe" }, + { + "name": "is_public", + "type": "boolean", + "ask": { + "en": "Is it a public application?", + "fr": "Est-ce une application publique ?", + "de": "Ist dies eine öffentliche Applikation?", + "cs": "Je tato aplikace veřejná?" + }, + "default": true + }, { "name": "database", "ask": { @@ -70,17 +81,6 @@ "cs": "Mohou se noví uživatelé registrovat?" }, "default": false - }, - { - "name": "is_public", - "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?", - "de": "Ist dies eine öffentliche Applikation?", - "cs": "Je tato aplikace veřejná?" - }, - "default": true } ] } diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..b88ce79 --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,18 @@ +## Problem +- *Description of why you made this PR* + +## Solution +- *And how do you fix that problem* + +## PR Status +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Package_check results +--- +*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* + +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/kimai2_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/kimai2_ynh%20PR-NUM-%20(USERNAME)/) diff --git a/scripts/_common.sh b/scripts/_common.sh index f54d90a..2ba000d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,207 +1,22 @@ #!/bin/bash -# ============= FUTURE YUNOHOST HELPER ============= -# Delete a file checksum from the app settings -# -# $app should be defined when calling this helper -# -# usage: ynh_remove_file_checksum file -# | arg: file - The file for which the checksum will be deleted -ynh_delete_file_checksum () { - local checksum_setting_name=checksum_${1//[\/ ]/_} # Replace all '/' and ' ' by '_' - ynh_app_setting_delete $app $checksum_setting_name -} +#================================================= +# COMMON VARIABLES +#================================================= +# dependencies used by the app +pkg_dependencies="" -# Create a dedicated php-fpm config -# -# usage: ynh_add_fpm_config -ynh_add_fpm7.2_config () { - # Configure PHP-FPM 7.2 by default - local fpm_config_dir="/etc/php/7.2/fpm" - local fpm_service="php7.2-fpm" - ynh_app_setting_set $app fpm_config_dir "$fpm_config_dir" - ynh_app_setting_set $app fpm_service "$fpm_service" - finalphpconf="$fpm_config_dir/pool.d/$app.conf" - ynh_backup_if_checksum_is_different "$finalphpconf" - sudo cp ../conf/php-fpm.conf "$finalphpconf" - ynh_replace_string "__NAMETOCHANGE__" "$app" "$finalphpconf" - ynh_replace_string "__FINALPATH__" "$final_path" "$finalphpconf" - ynh_replace_string "__USER__" "$app" "$finalphpconf" - sudo chown root: "$finalphpconf" - ynh_store_file_checksum "$finalphpconf" +extra_pkg_dependencies="php7.3-mbstring php7.3-gd php7.3-intl php7.3-pdo php7.3-xml php7.3-zip php7.3-xsl php7.3-ldap php7.3-mysql php7.3-sqlite3 php7.3-ctype php7.3-iconv php7.3-json php7.3-cli php7.3-simplexml php7.3-tokenizer" - if [ -e "../conf/php-fpm.ini" ] - then - finalphpini="$fpm_config_dir/conf.d/20-$app.ini" - ynh_backup_if_checksum_is_different "$finalphpini" - sudo cp ../conf/php-fpm.ini "$finalphpini" - sudo chown root: "$finalphpini" - ynh_store_file_checksum "$finalphpini" - fi - sudo systemctl reload $fpm_service -} +#================================================= +# PERSONAL HELPERS +#================================================= -# Remove the dedicated php-fpm config -# -# usage: ynh_remove_fpm7.2_config -ynh_remove_fpm7.2_config () { - local fpm_config_dir=$(ynh_app_setting_get $app fpm_config_dir) - local fpm_service=$(ynh_app_setting_get $app fpm_service) - ynh_secure_remove "$fpm_config_dir/pool.d/$app.conf" - ynh_secure_remove "$fpm_config_dir/conf.d/20-$app.ini" 2>&1 - sudo systemctl reload $fpm_service -} +#================================================= +# EXPERIMENTAL HELPERS +#================================================= -# Execute a command as another user -# usage: exec_as USER COMMAND [ARG ...] -exec_as() { - local USER=$1 - shift 1 - - if [[ $USER = $(whoami) ]]; then - eval $@ - else - # use sudo twice to be root and be allowed to use another user - sudo sudo -u "$USER" $@ - fi -} - -# -# Composer helpers -# - -# Execute a composer command from a given directory -# usage: composer_exec AS_USER WORKDIR COMMAND [ARG ...] -exec_composer() { - local WORKDIR=$1 - shift 1 - - COMPOSER_HOME="${WORKDIR}/.composer" \ - sudo /usr/bin/php7.2 "${WORKDIR}/composer.phar" $@ \ - -d "${WORKDIR}" -} - -# Install and initialize Composer in the given directory -# usage: init_composer DESTDIR [AS_USER] -init_composer() { - local DESTDIR=$1 - local AS_USER=${2:-admin} - - # install composer - curl -sS https://getcomposer.org/installer \ - | COMPOSER_HOME="${DESTDIR}/.composer" \ - sudo /usr/bin/php7.2 -- --install-dir="$DESTDIR" \ - || ynh_die "Unable to install Composer" - - # update dependencies to create composer.lock - exec_composer "$DESTDIR" install --no-dev --optimize-autoloader \ - || ynh_die "Unable to update Kimai2 core dependencies" -} - -sudo_path () { - sudo env "PATH=$PATH" $@ -} - -# Install and initialize Composer for upgrade script in the given directory -# usage: init_composer DESTDIR [AS_USER] -init_symfony_update() { - local DESTDIR=$1 - local AS_USER=${2:-admin} - - # install composer for upgrade script - curl -sS https://getcomposer.org/installer \ - | COMPOSER_HOME="${DESTDIR}/.composer" \ - sudo /usr/bin/php7.2 -- --install-dir="$DESTDIR" \ - || ynh_die "Unable to install Composer" - - # update symfony - exec_composer "$DESTDIR" update symfony/flex --no-plugins --no-scripts \ - || ynh_die "Unable to update symfony for Kimai2" -} - -sudo_path () { - sudo env "PATH=$PATH" $@ -} -# -# php7.2 helpers -# - -ynh_install_php7 () { - - ynh_package_update - ynh_package_install apt-transport-https --no-install-recommends - - wget -q -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg - echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/php7.list - - ynh_package_update - ynh_install_app_dependencies php7.2 php7.2-zip php7.2-fpm php7.2-mysql php7.2-xml php7.2-intl php7.2-mbstring php7.2-gd php7.2-curl php7.2-bcmath php7.2-opcache php7.2-sqlite3 - - sudo update-alternatives --install /usr/bin/php php /usr/bin/php5 70 -} - -ynh_remove_php7 () { - sudo rm -f /etc/apt/sources.list.d/php7.list - sudo apt-key del 4096R/89DF5277 - sudo apt-key del 2048R/11A06851 - ynh_remove_app_dependencies php7.2 php7.2-zip php7.2-fpm php7.2-mysql php7.2-xml php7.2-intl php7.2-mbstring php7.2-gd php7.2-curl php7.2-bcmath php7.2-opcache php7.2-sqlite3 -} - - -# Send an email to inform the administrator -# -# usage: ynh_send_readme_to_admin app_message [recipients] -# | arg: app_message - The message to send to the administrator. -# | arg: recipients - The recipients of this email. Use spaces to separate multiples recipients. - default: root -# example: "root admin@domain" -# If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you -# example: "root admin@domain user1 user2" -ynh_send_readme_to_admin() { - local app_message="${1:-...No specific information...}" - local recipients="${2:-root}" - - # Retrieve the email of users - find_mails () { - local list_mails="$1" - local mail - local recipients=" " - # Read each mail in argument - for mail in $list_mails - do - # Keep root or a real email address as it is - if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@" - then - recipients="$recipients $mail" - else - # But replace an user name without a domain after by its email - if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null) - then - recipients="$recipients $mail" - fi - fi - done - echo "$recipients" - } - recipients=$(find_mails "$recipients") - - local mail_subject="☁️🆈🅽🅷☁️: \`$app\` was just installed!" - - local mail_message="This is an automated message from your beloved YunoHost server. -Specific information for the application $app. -$app_message ---- -Automatic diagnosis data from YunoHost -$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" - - # Define binary to use for mail command - if [ -e /usr/bin/bsd-mailx ] - then - local mail_bin=/usr/bin/bsd-mailx - else - local mail_bin=/usr/bin/mail.mailutils - fi - - # Send the email to the recipients - echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients" -} +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= diff --git a/scripts/backup b/scripts/backup index da00816..6641144 100755 --- a/scripts/backup +++ b/scripts/backup @@ -6,17 +6,18 @@ # IMPORT GENERIC HELPERS #================================================= -if [ ! -e _common.sh ]; then - # Get the _common.sh file if it's not in the current directory - cp ../settings/scripts/_common.sh ./_common.sh - chmod a+rx _common.sh -fi -source _common.sh +#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts +source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= # MANAGE SCRIPT FAILURE #================================================= +ynh_print_info --message="Managing script failure..." + +ynh_clean_setup () { + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -24,39 +25,49 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get $app final_path) -domain=$(ynh_app_setting_get $app domain) -database=$(ynh_app_setting_get $app database) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +domain=$(ynh_app_setting_get --app=$app --key=domain) +database=$(ynh_app_setting_get --app=$app --key=database) #================================================= # STANDARD BACKUP STEPS #================================================= # BACKUP THE APP MAIN DIR #================================================= +ynh_print_info --message="Backing up the main app directory..." -ynh_backup "$final_path" +ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= +ynh_print_info --message="Backing up nginx web server configuration..." -ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= +ynh_print_info --message="Backing up php-fpm configuration..." -ynh_backup "/etc/php/7.2/fpm/pool.d/$app.conf" +ynh_backup --src_path="/etc/php/7.3/fpm/pool.d/$app.conf" -if [ "$database" = "mysql" ]; then - db_name=$(ynh_app_setting_get $app db_name) #================================================= # BACKUP THE MYSQL DATABASE #================================================= - ynh_mysql_dump_db "$db_name" > db.sql +if [ "$database" = "mysql" ]; then + db_name=$(ynh_app_setting_get --app=$app --key=db_name) + ynh_mysql_dump_db --database="$db_name" > db.sql fi + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/install b/scripts/install index d18a9a6..76721ff 100755 --- a/scripts/install +++ b/scripts/install @@ -7,234 +7,208 @@ #================================================= source _common.sh +source ynh_add_extra_apt_repos__3 +source ynh_install_php__3 +source ynh_send_readme_to_admin__2 source /usr/share/yunohost/helpers #================================================= # MANAGE SCRIPT FAILURE #================================================= +ynh_print_info --message="Managing script failure..." +ynh_clean_setup () { + read -p "key" + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= +ynh_print_info --message="Retrieving arguments from the manifest..." domain=$YNH_APP_ARG_DOMAIN path_url="/" admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -admin_pass=$(ynh_string_random 24) -random_key=$(ynh_string_random 32) registration=$YNH_APP_ARG_REGISTRATION database=$YNH_APP_ARG_DATABASE +admin_pass=$(ynh_string_random 24) +random_key=$(ynh_string_random 32) +admin_email=$(ynh_user_get_info $admin 'mail') -# This is a multi-instance app, meaning it can be installed several times independently -# The id of the app as stated in the manifest is available as $YNH_APP_ID -# The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...) -# The app instance name is available as $YNH_APP_INSTANCE_NAME -# - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample -# - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2 -# - ynhexample__{N} for the subsequent installations, with N=3,4, ... -# The app instance name is probably what you are interested the most, since this is -# guaranteed to be unique. This is a good unique identifier to define installation path, -# db names, ... app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= +ynh_print_info --message="Validating installation parameters..." final_path=/var/www/$app -test ! -e "$final_path" || ynh_die "This path already contains a folder" +test ! -e "$final_path" || ynh_die --message="This path already contains a folder" -# Normalize the url path syntax -path_url=$(ynh_normalize_url_path $path_url) - -# Check web path availability -ynh_webpath_available $domain $path_url # Register (book) web path -ynh_webpath_register $app $domain $path_url +ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= +ynh_print_info --message="Storing installation settings..." -ynh_app_setting_set $app domain $domain -ynh_app_setting_set $app path $path_url -ynh_app_setting_set $app admin $admin -ynh_app_setting_set $app is_public $is_public -ynh_app_setting_set $app random_key $random_key -ynh_app_setting_set $app registration $registration -ynh_app_setting_set $app database $database - +ynh_app_setting_set --app=$app --key=domain --value=$domain +ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=admin --value=$admin +ynh_app_setting_set --app=$app --key=is_public --value=$is_public +ynh_app_setting_set --app=$app --key=random_key --value=$random_key +ynh_app_setting_set --app=$app --key=registration --value=$registration +ynh_app_setting_set --app=$app --key=database --value=$database #================================================= # STANDARD MODIFICATIONS #================================================= -# INSTALL DEPENDENCIES +# INSTALL PHP7.3 #================================================= -ynh_install_php7 +if [ "$(lsb_release --codename --short)" = "buster" ]; then + pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies" +else + ynh_print_info --message="Installing PHP7.3..." + ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" +fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_print_info --message="Setting up source files..." -ynh_app_setting_set $app final_path $final_path +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 "$final_path" +ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= +ynh_print_info --message="Configuring nginx web server..." # Create a dedicated nginx config ynh_add_nginx_config -if [ "$path_url" != "/" ] -then - ynh_replace_string "^#sub_path_only" "" "/etc/nginx/conf.d/$domain.d/$app.conf" -fi -ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # CREATE DEDICATED USER #================================================= +ynh_print_info --message="Configuring system user..." # Create a system user -ynh_system_user_create $app - -#================================================= -# PHP-FPM 7.2 CONFIGURATION -#================================================= - -# Create a dedicated php-fpm7.2 config -ynh_add_fpm7.2_config +ynh_system_user_create --username=$app #================================================= # SPECIFIC SETUP #================================================= +# CONFIGURE KIMAI 2 +#================================================= +ynh_print_info --message="Configuring Kimai 2..." -# GET THE ADMIN EMAIL -email=$(ynh_user_get_info $admin 'mail') - -# COPY LOCAL.YAML -sudo cp ../conf/local.yaml $final_path/config/packages/local.yaml - +# Configure registration +sudo cp ../conf/local.yaml $final_path/config/packages/local.yaml if [ $registration -eq 1 ] then - -# MODIFY LOCAL.YAML ynh_replace_string "__REGISTRATION__" "true" "$final_path/config/packages/local.yaml" -fi - -if [ $registration -eq 0 ] -then -# MODIFY LOCAL.YAML +else ynh_replace_string "__REGISTRATION__" "false" "$final_path/config/packages/local.yaml" fi -# CHECK WHICH DATABASE TO USE +env_conf=$final_path/.env +# Configure environement if [ "$database" = "mysql" ]; then # setup application config - sudo cp ../conf/.env $final_path/.env -#================================================= -# CREATE A MYSQL DATABASE -#================================================= - -### Use these lines if you need a database for the application. -### `ynh_mysql_setup_db` will create a database, an associated user and a ramdom password. -### The password will be stored as 'mysqlpwd' into the app settings, -### and will be available as $db_pwd -### If you're not using these lines: -### - Remove the section "BACKUP THE MYSQL DATABASE" in the backup script -### - Remove also the section "REMOVE THE MYSQL DATABASE" in the remove script -### - As well as the section "RESTORE THE MYSQL DATABASE" in the restore script - -db_name=$(ynh_sanitize_dbid $app) -ynh_app_setting_set $app db_name $db_name -ynh_mysql_setup_db $db_name $db_name - -#================================================= -# MODIFY A CONFIG FILE -#================================================= - ynh_replace_string "__RANDOM_KEY__" "$random_key" "$final_path/.env" - ynh_replace_string "__DOMAIN__" "$domain" "$final_path/.env" - ynh_replace_string "__DB_PASSWORD__" "$db_pwd" "$final_path/.env" - ynh_replace_string "__DB_USER__" "$db_name" "$final_path/.env" - ynh_replace_string "__DB_NAME__" "$db_name" "$final_path/.env" + sudo cp ../conf/.env.mysql $env_conf + db_name=$(ynh_sanitize_dbid $app) + ynh_app_setting_set $app db_name $db_name + ynh_mysql_setup_db $db_name $db_name + + ynh_replace_string "__RANDOM_KEY__" "$random_key" "$env_conf" + ynh_replace_string "__DOMAIN__" "$domain" "$env_conf" + ynh_replace_string "__DB_PASSWORD__" "$db_pwd" "$env_conf" + ynh_replace_string "__DB_USER__" "$db_name" "$env_conf" + ynh_replace_string "__DB_NAME__" "$db_name" "$env_conf" else # setup application config - sudo cp ../conf/.env.sqlite $final_path/.env - -#================================================= -# MODIFY A CONFIG FILE -#================================================= - ynh_replace_string "__RANDOM_KEY__" "$random_key" "$final_path/.env" - ynh_replace_string "__DOMAIN__" "$domain" "$final_path/.env" - + sudo cp ../conf/.env.sqlite $env_conf + ynh_replace_string "__RANDOM_KEY__" "$random_key" "$env_conf" + ynh_replace_string "__DOMAIN__" "$domain" "$env_conf" fi -# COMPOSR AND SPECIFIC INSTALL FOR THE APP -init_composer $final_path -cd $final_path && sudo /usr/bin/php7.2 bin/console doctrine:schema:create -cd $final_path && sudo /usr/bin/php7.2 bin/console cache:warmup --env=prod -cd $final_path && sudo /usr/bin/php7.2 bin/console kimai:create-user "$admin" "$email" ROLE_SUPER_ADMIN "$admin_pass" -cd $final_path && sudo /usr/bin/php7.2 bin/console doctrine:migrations:version --add --all -n +#================================================= +# BUILD KIMAI 2 +#================================================= +ynh_print_info --message="Building Kimai 2..." +pushd "$final_path" + php7.3 bin/console kimai:install -n +popd #================================================= -# SETUP APPLICATION -#================================================= - -# Set right permissions -chown -R $app: $final_path - -#================================================= -# STORE THE CHECKSUM OF THE CONFIG FILE +# STORE THE CONFIG FILE CHECKSUM #================================================= +ynh_print_info --message="Storing the config file checksum..." # Calculate and store the config file checksum into the app settings -ynh_store_file_checksum "$final_path/.env" +ynh_store_file_checksum --file="$env_conf" + +#================================================= +# GENERIC FINALIZATION +#================================================= +# PHP-FPM CONFIGURATION +#================================================= +ynh_print_info --message="Configuring php-fpm..." + +# Create a dedicated php-fpm config +ynh_add_fpm_config --phpversion="7.3" + +#================================================= +# SECURE FILES AND DIRECTORIES +#================================================= +ynh_print_info --message="Securing files and directories..." + +# Set permissions to app files +chown -R $app: $final_path #================================================= # SETUP SSOWAT #================================================= +ynh_print_info --message="Configuring SSOwat..." -if [ $is_public -eq 0 ] -then # Remove the public access - ynh_app_setting_delete $app skipped_uris -fi # Make app public if necessary if [ $is_public -eq 1 ] then # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set $app unprotected_uris "/" + ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" fi #================================================= # RELOAD NGINX #================================================= -systemctl reload php7.2-fpm -systemctl reload nginx -# Set default php to php5 or php7.0 -if [ "$(lsb_release --codename --short)" = "jessie" ]; then - update-alternatives --set php /usr/bin/php5 -else - update-alternatives --set php /usr/bin/php7.0 -fi +ynh_print_info --message="Reloading nginx web server..." + +ynh_systemd_action --service_name=nginx --action=reload #================================================= # SEND A README FOR THE ADMIN #================================================= +ynh_print_info --message="Sending a readme for the admin..." -message=" $app was successfully installed :) +ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="../conf/message" +ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/message" +ynh_replace_string --match_string="__PATH_URL__" --replace_string="$path_url" --target_file="../conf/message" +ynh_replace_string --match_string="__ADMIN_EMAIL__" --replace_string="$admin_email" --target_file="../conf/message" +ynh_replace_string --match_string="__ADMIN_PASS__" --replace_string="$admin_pass" --target_file="../conf/message" -Please open https://$domain$path_url +ynh_send_readme_to_admin --app_message="../conf/message" --recipients=$admin_email --type='install' -The admin username is: $email -Here is the admin password: $admin_pass +#================================================= +# END OF SCRIPT +#================================================= -If you facing any issue or want to improve the app, please open a new issue on the project page: https://github.com/YunoHost-Apps/kimai2_ynh" - -ynh_send_readme_to_admin "$message" +ynh_print_info --message="Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 42f5d76..d7f7903 100755 --- a/scripts/remove +++ b/scripts/remove @@ -7,61 +7,80 @@ #================================================= source _common.sh +source ynh_add_extra_apt_repos__3 +source ynh_install_php__3 source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -final_path=$(ynh_app_setting_get $app final_path) -database=$(ynh_app_setting_get $app database) - +domain=$(ynh_app_setting_get --app=$app --key=domain) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +database=$(ynh_app_setting_get --app=$app --key=database) #================================================= # STANDARD REMOVE #================================================= +# REMOVE THE MYSQL DATABASE +#================================================= +if [ "$database" = "mysql" ]; then + ynh_print_info --message="Removing the MySQL database..." + db_name=$(ynh_app_setting_get --app=$app --key=db_name) + db_user=$db_name + # Remove a database if it exists, along with the associated user + ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name +fi + +#================================================= +# REMOVE PHP +#================================================= + +if [ "$(lsb_release --codename --short)" != "buster" ]; then + ynh_print_info --message="Removing php..." + ynh_remove_php +fi #================================================= # REMOVE APP MAIN DIR #================================================= +ynh_print_info --message="Removing app main directory..." # Remove the app directory securely -ynh_secure_remove "$final_path" +ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= +ynh_print_info --message="Removing nginx web server configuration..." # Remove the dedicated nginx config ynh_remove_nginx_config -if [ "$database" = "mysql" ]; then - db_name=$(ynh_app_setting_get $app db_name) - db_user=$db_name -#================================================= -# REMOVE THE MYSQL DATABASE -#================================================= - -# Remove a database if it exists, along with the associated user - ynh_mysql_remove_db $db_user $db_name -fi - #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= +ynh_print_info --message="Removing php-fpm configuration..." # Remove the dedicated php-fpm config -ynh_remove_fpm7.2_config +ynh_remove_fpm_config #================================================= # GENERIC FINALIZATION #================================================= # REMOVE DEDICATED USER #================================================= +ynh_print_info --message="Removing the dedicated system user..." # Delete a system user -ynh_system_user_delete $app +ynh_system_user_delete --username=$app + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info --message="Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index 0dad618..46c3219 100755 --- a/scripts/restore +++ b/scripts/restore @@ -6,110 +6,122 @@ # IMPORT GENERIC HELPERS #================================================= -if [ ! -e _common.sh ]; then - # Get the _common.sh file if it's not in the current directory - cp ../settings/scripts/_common.sh ./_common.sh - chmod a+rx _common.sh -fi -source _common.sh +#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts +source ../settings/scripts/_common.sh +source ../settings/scripts/ynh_add_extra_apt_repos__3 +source ../settings/scripts/ynh_install_php__3 source /usr/share/yunohost/helpers #================================================= # MANAGE SCRIPT FAILURE #================================================= +ynh_print_info --message="Managing script failure..." +ynh_clean_setup () { + true +} # Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= +ynh_print_info --message="Loading settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -path_url=$(ynh_app_setting_get $app path) -final_path=$(ynh_app_setting_get $app final_path) -database=$(ynh_app_setting_get $app database) +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +database=$(ynh_app_setting_get --app=$app --key=database) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= +ynh_print_info --message="Validating restoration parameters..." -ynh_webpath_available $domain $path_url \ - || ynh_die "Path not available: ${domain}${path_url}" +ynh_webpath_available --domain=$domain --path_url=$path_url \ + || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ - || ynh_die "There is already a directory: $final_path " + || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS -#================================================= -# REINSTALL DEPENDENCIES -#================================================= - -# Define and install dependencies -ynh_install_php7 - #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= +ynh_print_info --message="Restoring the nginx configuration..." -ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= +ynh_print_info --message="Restoring the app main directory..." -ynh_restore_file "$final_path" - -if [ "$database" = "mysql" ]; then -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= - - db_pwd=$(ynh_app_setting_get $app mysqlpwd) - db_name=$(ynh_app_setting_get $app db_name) - ynh_mysql_setup_db $db_name $db_name $db_pwd - ynh_mysql_connect_as $db_name $db_pwd $db_name < ./db.sql -fi +ynh_restore_file --origin_path="$final_path" #================================================= # RECREATE THE DEDICATED USER #================================================= +ynh_print_info --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) -ynh_system_user_create $app +ynh_system_user_create --username=$app #================================================= # RESTORE USER RIGHTS #================================================= +ynh_print_info --message="Restoring user rights..." # Restore permissions on app files chown -R $app: $final_path -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= - -ynh_restore_file "/etc/php/7.2/fpm/pool.d/$app.conf" - #================================================= # SPECIFIC RESTORATION #================================================= +# REINSTALL PHP7.3 +#================================================= +if [ "$(lsb_release --codename --short)" = "buster" ]; then + pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies" +else + ynh_print_info --message="Reinstalling PHP7.3..." + ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" +fi +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= + +if [ "$database" = "mysql" ]; then + ynh_print_info --message="Restoring the MySQL database..." + db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) + db_name=$(ynh_app_setting_get --app=$app --key=db_name) + db_user=$db_name + ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd + ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +fi + +#================================================= +# RESTORE THE PHP-FPM CONFIGURATION +#================================================= +ynh_print_info --message="Restoring PHP-FPM configuration..." + +ynh_restore_file --origin_path="/etc/php/7.3/fpm/pool.d/$app.conf" #================================================= # GENERIC FINALIZATION #================================================= # RELOAD NGINX AND PHP-FPM #================================================= +ynh_print_info --message="Reloading nginx web server and php-fpm..." -systemctl reload php7.2-fpm -systemctl reload nginx -# Set default php to php5 or php7.0 -if [ "$(lsb_release --codename --short)" == "jessie" ]; then - update-alternatives --set php /usr/bin/php5 -else - update-alternatives --set php /usr/bin/php7.0 -fi +ynh_systemd_action --service_name=php7.3-fpm --action=reload +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info --message="Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index 052f3eb..5c4b983 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,45 +7,57 @@ #================================================= source _common.sh +source ynh_add_extra_apt_repos__3 +source ynh_install_php__3 source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -path_url=$(ynh_app_setting_get $app path) -admin=$(ynh_app_setting_get $app admin) -is_public=$(ynh_app_setting_get $app is_public) -final_path=$(ynh_app_setting_get $app final_path) -random_key=$(ynh_app_setting_get $app random_key) +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +admin=$(ynh_app_setting_get --app=$app --key=admin) +is_public=$(ynh_app_setting_get --app=$app --key=is_public) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +database=$(ynh_app_setting_get $app database) +random_key=$(ynh_app_setting_get --app=$app --key=random_key) +#================================================= +# CHECK VERSION +#================================================= +ynh_print_info --message="Checking version..." + +upgrade_type=$(ynh_check_app_version_changed) #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= +ynh_print_info --message="Ensuring downward compatibility..." # Fix is_public as a boolean value if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set $app is_public 1 + ynh_app_setting_set --app=$app --key=is_public --value=1 is_public=1 elif [ "$is_public" = "No" ]; then - ynh_app_setting_set $app is_public 0 + ynh_app_setting_set --app=$app --key=is_public --value=0 is_public=0 fi # If final_path doesn't exist, create it -if [ -z $final_path ]; then +if [ -z "$final_path" ]; then final_path=/var/www/$app - ynh_app_setting_set $app final_path $final_path + ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= +ynh_print_info --message="Backing up the app before upgrading (may take a while)..." # Backup the current version of the app ynh_backup_before_upgrade @@ -56,187 +68,169 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path $path_url) - -#================================================= -# INSTALL DEPENDENCIES -#================================================= - -ynh_install_php7 - #================================================= # STANDARD UPGRADE STEPS +#================================================= +# UPGRADE PHP7.3 +#================================================= + +if [ "$(lsb_release --codename --short)" = "buster" ]; then + pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies" +else + if [ "$(ynh_app_setting_get --app=$app --key=php_version)" != "7.3" ]; then + ynh_print_info --message="Upgrading PHP7.3..." + ynh_remove_fpm_config + ynh_remove_app_dependencies + ynh_remove_php + ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" + else + ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies" + fi +fi + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -# Download, check integrity, uncompress and patch the source from app.src and do required installation for update - -# version before upgrade -old_ver=`sudo yunohost app info $app --output-as plain | ynh_get_plain_key version` - -#version check for 0.3 -version=`cd /var/www/$app && bin/console kimai:version --short 2> /dev/null || sed -n 's/^future-release=//p' .github_changelog_generator` - -# Uncompress latest sources -# Create a temporary directory -tmpdir="$(mktemp -d)" -# Backup the config file in the temp dir -if [ -f $final_path/config/packages/local.yaml ]; then - cp -af "$final_path/config/packages/local.yaml" "$tmpdir/." -fi -if [ -d $final_path/var/invoices ]; then - cp -af "$final_path/var/invoices" "$tmpdir/." -fi -if [ -f $final_path/var/data/kimai.sqlite ]; then - cp -a "$final_path/var/data/kimai.sqlite" "$tmpdir/." - ynh_app_setting_set $app database "sqlite" -fi - - -ynh_setup_source "$final_path" - -# If the version is 0.3, symfony update is required -if [ "$version" = "0.3" ] +if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_secure_remove "$final_path" - ynh_setup_source "$final_path" - init_symfony_update $final_path -fi -ynh_secure_remove "$final_path" -ynh_setup_source "$final_path" -if [ -f $tmpdir/local.yaml ]; then - cp -af "$tmpdir/local.yaml" "$final_path/config/packages/." -fi -if [ -d $tmpdir/invoices ]; then - cp -af "$tmpdir/invoices" "$final_path/var/." -fi -if [ -f $tmpdir/kimai.sqlite ]; then -sudo cp -af "$tmpdir/kimai.sqlite" "$final_path/var/data/." + ynh_print_info --message="Upgrading source files..." + + # Create a temporary directory and backup config + tmpdir="$(mktemp -d)" + if [ -f $final_path/config/packages/local.yaml ]; then + cp -af "$final_path/config/packages/local.yaml" "$tmpdir/." + fi + if [ -d $final_path/var/invoices ]; then + cp -af "$final_path/var/invoices" "$tmpdir/." + fi + if [ -f $final_path/var/data/kimai.sqlite ]; then + cp -a "$final_path/var/data/kimai.sqlite" "$tmpdir/." + ynh_app_setting_set $app database "sqlite" + fi + + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir="$final_path" + + # Restore config + if [ -f $tmpdir/local.yaml ]; then + cp -af "$tmpdir/local.yaml" "$final_path/config/packages/." + fi + if [ -d $tmpdir/invoices ]; then + cp -af "$tmpdir/invoices" "$final_path/var/." + fi + if [ -f $tmpdir/kimai.sqlite ]; then + sudo cp -af "$tmpdir/kimai.sqlite" "$final_path/var/data/." + fi + + ynh_secure_remove --file="$tmpdir" fi -sudo rm -Rf "$tmpdir" -database=$(ynh_app_setting_get $app database) -if [ "$database" = "mysql" ]; then -# setup application config - sudo cp ../conf/.env $final_path/.env - -# GET DATABASE SETTINGS - db_name=$(ynh_app_setting_get $app db_name) - db_pwd=$(ynh_app_setting_get $app mysqlpwd) -#================================================= -# MODIFY A CONFIG FILE -#================================================= - ynh_replace_string "__RANDOM_KEY__" "$random_key" "$final_path/.env" - ynh_replace_string "__DOMAIN__" "$domain" "$final_path/.env" - ynh_replace_string "__DB_PASSWORD__" "$db_pwd" "$final_path/.env" - ynh_replace_string "__DB_USER__" "$db_name" "$final_path/.env" - ynh_replace_string "__DB_NAME__" "$db_name" "$final_path/.env" -else - # setup application config - sudo cp ../conf/.env.sqlite $final_path/.env - -#================================================= -# MODIFY A CONFIG FILE -#================================================= - ynh_replace_string "__RANDOM_KEY__" "$random_key" "$final_path/.env" - ynh_replace_string "__DOMAIN__" "$domain" "$final_path/.env" - -fi - -# COMPOSR AND SPECIFIC INSTALL FOR THE APP -init_composer $final_path -( -cd $final_path && sudo /usr/bin/php7.2 bin/console cache:clear --env=prod -cd $final_path && sudo /usr/bin/php7.2 bin/console cache:warmup --env=prod -cd $final_path && sudo /usr/bin/php7.2 bin/console doctrine:migrations:migrate -n - -# convert-timezone script has a problem running non-interactively (-n) on 0.8.1 -# fix it here -sed -i "s/, \$amount));/, \$amount), 'y');/" /var/www/$app/src/Command/ConvertTimezoneCommand.php - -# call convert-timezone script when upgrading from < 0.8 verions -# fixes timezone issue: https://github.com/kevinpapst/kimai2/pull/372 -if `dpkg --compare-versions $old_ver "lt" "0.8"` -then - cd $final_path && sudo /usr/bin/php7.2 bin/console kimai:convert-timezone -n -fi -) #================================================= # NGINX CONFIGURATION #================================================= +ynh_print_info --message="Upgrading nginx web server configuration..." # Create a dedicated nginx config ynh_add_nginx_config -if [ "$path_url" != "/" ] -then - ynh_replace_string "^#sub_path_only" "" "/etc/nginx/conf.d/$domain.d/$app.conf" -fi -ynh_store_file_checksum "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # CREATE DEDICATED USER #================================================= +ynh_print_info --message="Making sure dedicated system user exists..." -# Create a system user -ynh_system_user_create $app +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app #================================================= -# PHP-FPM 7.2 CONFIGURATION +# PHP-FPM CONFIGURATION #================================================= +ynh_print_info --message="Upgrading php-fpm configuration..." -# Create a dedicated php-fpm7.1 config -ynh_add_fpm7.2_config - +# Create a dedicated php-fpm config +ynh_add_fpm_config --phpversion="7.3" #================================================= # SPECIFIC UPGRADE #================================================= -# ... +# CONFIGURE KIMAI 2 #================================================= +ynh_print_info --message="Configuring Kimai 2..." + +env_conf=$final_path/.env # Verify the checksum and backup the file if it's different -ynh_backup_if_checksum_is_different "$final_path/.env" +ynh_backup_if_checksum_is_different "$env_conf" + +# Configure environement +if [ "$database" = "mysql" ]; then + # setup application config + sudo cp ../conf/.env.mysql $env_conf + db_name=$(ynh_sanitize_dbid $app) + ynh_app_setting_set $app db_name $db_name + ynh_mysql_setup_db $db_name $db_name + + ynh_replace_string "__RANDOM_KEY__" "$random_key" "$env_conf" + ynh_replace_string "__DOMAIN__" "$domain" "$env_conf" + ynh_replace_string "__DB_PASSWORD__" "$db_pwd" "$env_conf" + ynh_replace_string "__DB_USER__" "$db_name" "$env_conf" + ynh_replace_string "__DB_NAME__" "$db_name" "$env_conf" +else + # setup application config + sudo cp ../conf/.env.sqlite $env_conf + ynh_replace_string "__RANDOM_KEY__" "$random_key" "$env_conf" + ynh_replace_string "__DOMAIN__" "$domain" "$env_conf" +fi + +#================================================= +# UPGRADE KIMAI 2 +#================================================= +ynh_print_info --message="Upgrading Kimai 2..." + +pushd "$final_path" + php7.3 bin/console kimai:update +popd + +#================================================= +# STORE THE CONFIG FILE CHECKSUM +#================================================= +ynh_print_info --message="Storing the config file checksum..." + + # Recalculate and store the config file checksum into the app settings -ynh_store_file_checksum "$final_path/.env" +ynh_store_file_checksum "$env_conf" #================================================= # GENERIC FINALIZATION #================================================= # SECURE FILES AND DIRECTORIES #================================================= +ynh_print_info --message="Securing files and directories..." -# Set right permissions +# Set permissions on app files chown -R $app: $final_path #================================================= # SETUP SSOWAT #================================================= +ynh_print_info --message="Upgrading SSOwat configuration..." -if [ $is_public -eq 0 ] -then # Remove the public access - ynh_app_setting_delete $app skipped_uris -fi # Make app public if necessary if [ $is_public -eq 1 ] then # unprotected_uris allows SSO credentials to be passed anyway - ynh_app_setting_set $app unprotected_uris "/" + ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" fi #================================================= # RELOAD NGINX #================================================= -systemctl reload php7.2-fpm -systemctl reload nginx -# Set default php to php5 or php7.0 -if [ "$(lsb_release --codename --short)" == "jessie" ]; then - update-alternatives --set php /usr/bin/php5 -else - update-alternatives --set php /usr/bin/php7.0 -fi +ynh_print_info --message="Reloading nginx web server..." + +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_print_info --message="Upgrade of $app completed" diff --git a/scripts/ynh_add_extra_apt_repos__3 b/scripts/ynh_add_extra_apt_repos__3 new file mode 100644 index 0000000..3276f00 --- /dev/null +++ b/scripts/ynh_add_extra_apt_repos__3 @@ -0,0 +1,294 @@ +#!/bin/bash + +# Pin a repository. +# +# usage: ynh_pin_repo --package=packages --pin=pin_filter [--priority=priority_value] [--name=name] [--append] +# | arg: -p, --package - Packages concerned by the pin. Or all, *. +# | arg: -i, --pin - Filter for the pin. +# | arg: -p, --priority - Priority for the pin +# | arg: -n, --name - Name for the files for this repo, $app as default value. +# | arg: -a, --append - Do not overwrite existing files. +# +# See https://manpages.debian.org/stretch/apt/apt_preferences.5.en.html for information about pinning. +# +ynh_pin_repo () { + # Declare an array to define the options of this helper. + local legacy_args=pirna + declare -Ar args_array=( [p]=package= [i]=pin= [r]=priority= [n]=name= [a]=append ) + local package + local pin + local priority + local name + local append + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + package="${package:-*}" + priority=${priority:-50} + name="${name:-$app}" + append=${append:-0} + + if [ $append -eq 1 ] + then + append="tee -a" + else + append="tee" + fi + + mkdir -p "/etc/apt/preferences.d" + echo "Package: $package +Pin: $pin +Pin-Priority: $priority" \ + | $append "/etc/apt/preferences.d/$name" +} + +# Add a repository. +# +# usage: ynh_add_repo --uri=uri --suite=suite --component=component [--name=name] [--append] +# | arg: -u, --uri - Uri of the repository. +# | arg: -s, --suite - Suite of the repository. +# | arg: -c, --component - Component of the repository. +# | arg: -n, --name - Name for the files for this repo, $app as default value. +# | arg: -a, --append - Do not overwrite existing files. +# +# Example for a repo like deb http://forge.yunohost.org/debian/ stretch stable +# uri suite component +# ynh_add_repo --uri=http://forge.yunohost.org/debian/ --suite=stretch --component=stable +# +ynh_add_repo () { + # Declare an array to define the options of this helper. + local legacy_args=uscna + declare -Ar args_array=( [u]=uri= [s]=suite= [c]=component= [n]=name= [a]=append ) + local uri + local suite + local component + local name + local append + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + name="${name:-$app}" + append=${append:-0} + + if [ $append -eq 1 ] + then + append="tee -a" + else + append="tee" + fi + + mkdir -p "/etc/apt/sources.list.d" + # Add the new repo in sources.list.d + echo "deb $uri $suite $component" \ + | $append "/etc/apt/sources.list.d/$name.list" +} + +# Add an extra repository correctly, pin it and get the key. +# +# usage: ynh_install_extra_repo --repo="repo" [--key=key_url] [--priority=priority_value] [--name=name] [--append] +# | arg: -r, --repo - Complete url of the extra repository. +# | arg: -k, --key - url to get the public key. +# | arg: -p, --priority - Priority for the pin +# | arg: -n, --name - Name for the files for this repo, $app as default value. +# | arg: -a, --append - Do not overwrite existing files. +ynh_install_extra_repo () { + # Declare an array to define the options of this helper. + local legacy_args=rkpna + declare -Ar args_array=( [r]=repo= [k]=key= [p]=priority= [n]=name= [a]=append ) + local repo + local key + local priority + local name + local append + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + name="${name:-$app}" + append=${append:-0} + key=${key:-0} + priority=${priority:-} + + if [ $append -eq 1 ] + then + append="--append" + wget_append="tee -a" + else + append="" + wget_append="tee" + fi + + # Split the repository into uri, suite and components. + # Remove "deb " at the beginning of the repo. + repo="${repo#deb }" + + # Get the uri + local uri="$(echo "$repo" | awk '{ print $1 }')" + + # Get the suite + local suite="$(echo "$repo" | awk '{ print $2 }')" + + # Get the components + local component="${repo##$uri $suite }" + + # Add the repository into sources.list.d + ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" $append + + # Pin the new repo with the default priority, so it won't be used for upgrades. + # Build $pin from the uri without http and any sub path + local pin="${uri#*://}" + pin="${pin%%/*}" + # Set a priority only if asked + if [ -n "$priority" ] + then + priority="--priority=$priority" + fi + ynh_pin_repo --package="*" --pin="origin \"$pin\"" $priority --name="$name" $append + + # Get the public key for the repo + if [ -n "$key" ] + then + mkdir -p "/etc/apt/trusted.gpg.d" + wget -q "$key" -O - | gpg --dearmor | $wget_append /etc/apt/trusted.gpg.d/$name.gpg > /dev/null + fi + + # Update the list of package with the new repo + ynh_package_update +} + +# Remove an extra repository and the assiociated configuration. +# +# usage: ynh_remove_extra_repo [--name=name] +# | arg: -n, --name - Name for the files for this repo, $app as default value. +ynh_remove_extra_repo () { + # Declare an array to define the options of this helper. + local legacy_args=n + declare -Ar args_array=( [n]=name= ) + local name + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + name="${name:-$app}" + + ynh_secure_remove "/etc/apt/sources.list.d/$name.list" + ynh_secure_remove "/etc/apt/preferences.d/$name" + ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.gpg" + ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.asc" + + # Update the list of package to exclude the old repo + ynh_package_update +} + +# Install packages from an extra repository properly. +# +# usage: ynh_install_extra_app_dependencies --repo="repo" --package="dep1 dep2" [--key=key_url] [--name=name] +# | arg: -r, --repo - Complete url of the extra repository. +# | arg: -p, --package - The packages to install from this extra repository +# | arg: -k, --key - url to get the public key. +# | arg: -n, --name - Name for the files for this repo, $app as default value. +ynh_install_extra_app_dependencies () { + # Declare an array to define the options of this helper. + local legacy_args=rpkn + declare -Ar args_array=( [r]=repo= [p]=package= [k]=key= [n]=name= ) + local repo + local package + local key + local name + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + name="${name:-$app}" + key=${key:-0} + + # Set a key only if asked + if [ -n "$key" ] + then + key="--key=$key" + fi + # Add an extra repository for those packages + ynh_install_extra_repo --repo="$repo" $key --priority=995 --name=$name + + # Install requested dependencies from this extra repository. + ynh_add_app_dependencies --package="$package" + + # Remove this extra repository after packages are installed + ynh_remove_extra_repo --name=$app +} + +#================================================= + +# patched version of ynh_install_app_dependencies to be used with ynh_add_app_dependencies + +# Define and install dependencies with a equivs control file +# This helper can/should only be called once per app +# +# usage: ynh_install_app_dependencies dep [dep [...]] +# | arg: dep - the package name to install in dependence +# You can give a choice between some package with this syntax : "dep1|dep2" +# Example : ynh_install_app_dependencies dep1 dep2 "dep3|dep4|dep5" +# This mean in the dependence tree : dep1 & dep2 & (dep3 | dep4 | dep5) +# +# Requires YunoHost version 2.6.4 or higher. +ynh_install_app_dependencies () { + local dependencies=$@ + dependencies="$(echo "$dependencies" | sed 's/\([^\<=\>]\)\ \([^(]\)/\1, \2/g')" + dependencies=${dependencies//|/ | } + local manifest_path="../manifest.json" + if [ ! -e "$manifest_path" ]; then + manifest_path="../settings/manifest.json" # Into the restore script, the manifest is not at the same place + fi + + local version=$(grep '\"version\": ' "$manifest_path" | cut -d '"' -f 4) # Retrieve the version number in the manifest file. + if [ ${#version} -eq 0 ]; then + version="1.0" + fi + local dep_app=${app//_/-} # Replace all '_' by '-' + + # Handle specific versions + if [[ "$dependencies" =~ [\<=\>] ]] + then + # Replace version specifications by relationships syntax + # https://www.debian.org/doc/debian-policy/ch-relationships.html + # Sed clarification + # [^(\<=\>] ignore if it begins by ( or < = >. To not apply twice. + # [\<=\>] matches < = or > + # \+ matches one or more occurence of the previous characters, for >= or >>. + # [^,]\+ matches all characters except ',' + # Ex: package>=1.0 will be replaced by package (>= 1.0) + dependencies="$(echo "$dependencies" | sed 's/\([^(\<=\>]\)\([\<=\>]\+\)\([^,]\+\)/\1 (\2 \3)/g')" + fi + + cat > /tmp/${dep_app}-ynh-deps.control << EOF # Make a control file for equivs-build +Section: misc +Priority: optional +Package: ${dep_app}-ynh-deps +Version: ${version} +Depends: ${dependencies} +Architecture: all +Description: Fake package for $app (YunoHost app) dependencies + This meta-package is only responsible of installing its dependencies. +EOF + ynh_package_install_from_equivs /tmp/${dep_app}-ynh-deps.control \ + || ynh_die --message="Unable to install dependencies" # Install the fake package and its dependencies + rm /tmp/${dep_app}-ynh-deps.control + ynh_app_setting_set --app=$app --key=apt_dependencies --value="$dependencies" +} + +ynh_add_app_dependencies () { + # Declare an array to define the options of this helper. + local legacy_args=pr + declare -Ar args_array=( [p]=package= [r]=replace) + local package + local replace + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + replace=${replace:-0} + + local current_dependencies="" + if [ $replace -eq 0 ] + then + local dep_app=${app//_/-} # Replace all '_' by '-' + if ynh_package_is_installed --package="${dep_app}-ynh-deps" + then + current_dependencies="$(dpkg-query --show --showformat='${Depends}' ${dep_app}-ynh-deps) " + fi + + current_dependencies=${current_dependencies// | /|} + fi + + ynh_install_app_dependencies "${current_dependencies}${package}" +} diff --git a/scripts/ynh_install_php__3 b/scripts/ynh_install_php__3 new file mode 100644 index 0000000..8d8323a --- /dev/null +++ b/scripts/ynh_install_php__3 @@ -0,0 +1,78 @@ +#!/bin/bash + +# Install another version of php. +# +# usage: ynh_install_php --phpversion=phpversion [--package=packages] +# | arg: -v, --phpversion - Version of php to install. Can be one of 7.1, 7.2 or 7.3 +# | arg: -p, --package - Additionnal php packages to install +ynh_install_php () { + # Declare an array to define the options of this helper. + local legacy_args=vp + declare -Ar args_array=( [v]=phpversion= [p]=package= ) + local phpversion + local package + # Manage arguments with getopts + ynh_handle_getopts_args "$@" + package=${package:-} + + # Store php_version into the config of this app + ynh_app_setting_set $app php_version $phpversion + + if [ "$phpversion" == "7.0" ] + then + ynh_die "Do not use ynh_install_php to install php7.0" + fi + + # Store the ID of this app and the version of php requested for it + echo "$YNH_APP_INSTANCE_NAME:$phpversion" | tee --append "/etc/php/ynh_app_version" + + # Add an extra repository for those packages + ynh_install_extra_repo --repo="https://packages.sury.org/php/ $(lsb_release -sc) main" --key="https://packages.sury.org/php/apt.gpg" --priority=995 --name=extra_php_version + + # Install requested dependencies from this extra repository. + # Install php-fpm first, otherwise php will install apache as a dependency. + ynh_add_app_dependencies --package="php${phpversion}-fpm" + ynh_add_app_dependencies --package="php$phpversion php${phpversion}-common $package" + + # Set php7.0 back as the default version for php-cli. + update-alternatives --set php /usr/bin/php7.0 + + # Pin this extra repository after packages are installed to prevent sury of doing shit + ynh_pin_repo --package="*" --pin="origin \"packages.sury.org\"" 200 --name=extra_php_version + ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version --append + + # INTEGRATE SERVICE IN YUNOHOST + yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log" +} + +ynh_remove_php () { + # Get the version of php used by this app + local phpversion=$(ynh_app_setting_get $app php_version) + + if [ "$phpversion" == "7.0" ] || [ -z "$phpversion" ] + then + if [ "$phpversion" == "7.0" ] + then + ynh_print_err "Do not use ynh_remove_php to install php7.0" + fi + return 0 + fi + + # Remove the line for this app + sed --in-place "/$YNH_APP_INSTANCE_NAME:$phpversion/d" "/etc/php/ynh_app_version" + + # If no other app uses this version of php, remove it. + if ! grep --quiet "$phpversion" "/etc/php/ynh_app_version" + then + # Purge php dependences for this version. + ynh_package_autopurge "php$phpversion php${phpversion}-fpm php${phpversion}-common" + # Remove the service from the admin panel + yunohost service remove php${phpversion}-fpm + fi + + # If no other app uses alternate php versions, remove the extra repo for php + if [ ! -s "/etc/php/ynh_app_version" ] + then + ynh_secure_remove /etc/php/ynh_app_version + fi +} diff --git a/scripts/ynh_send_readme_to_admin__2 b/scripts/ynh_send_readme_to_admin__2 new file mode 100644 index 0000000..06cff8c --- /dev/null +++ b/scripts/ynh_send_readme_to_admin__2 @@ -0,0 +1,140 @@ +#!/bin/bash + +# Send an email to inform the administrator +# +# usage: ynh_send_readme_to_admin --app_message=app_message [--recipients=recipients] [--type=type] +# | arg: -m --app_message= - The file with the content to send to the administrator. +# | arg: -r, --recipients= - The recipients of this email. Use spaces to separate multiples recipients. - default: root +# example: "root admin@domain" +# If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you +# example: "root admin@domain user1 user2" +# | arg: -t, --type= - Type of mail, could be 'backup', 'change_url', 'install', 'remove', 'restore', 'upgrade' +ynh_send_readme_to_admin() { + # Declare an array to define the options of this helper. + declare -Ar args_array=( [m]=app_message= [r]=recipients= [t]=type= ) + local app_message + local recipients + local type + # Manage arguments with getopts + + ynh_handle_getopts_args "$@" + app_message="${app_message:-}" + recipients="${recipients:-root}" + type="${type:-install}" + + # Get the value of admin_mail_html + admin_mail_html=$(ynh_app_setting_get $app admin_mail_html) + admin_mail_html="${admin_mail_html:-0}" + + # Retrieve the email of users + find_mails () { + local list_mails="$1" + local mail + local recipients=" " + # Read each mail in argument + for mail in $list_mails + do + # Keep root or a real email address as it is + if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@" + then + recipients="$recipients $mail" + else + # But replace an user name without a domain after by its email + if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null) + then + recipients="$recipients $mail" + fi + fi + done + echo "$recipients" + } + recipients=$(find_mails "$recipients") + + # Subject base + local mail_subject="☁️🆈🅽🅷☁️: \`$app\`" + + # Adapt the subject according to the type of mail required. + if [ "$type" = "backup" ]; then + mail_subject="$mail_subject has just been backup." + elif [ "$type" = "change_url" ]; then + mail_subject="$mail_subject has just been moved to a new URL!" + elif [ "$type" = "remove" ]; then + mail_subject="$mail_subject has just been removed!" + elif [ "$type" = "restore" ]; then + mail_subject="$mail_subject has just been restored!" + elif [ "$type" = "upgrade" ]; then + mail_subject="$mail_subject has just been upgraded!" + else # install + mail_subject="$mail_subject has just been installed!" + fi + + local mail_message="This is an automated message from your beloved YunoHost server. + +Specific information for the application $app. + +$(if [ -n "$app_message" ] +then + cat "$app_message" +else + echo "...No specific information..." +fi) + +--- +Automatic diagnosis data from YunoHost + +__PRE_TAG1__$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')__PRE_TAG2__" + + # Store the message into a file for further modifications. + echo "$mail_message" > mail_to_send + + # If a html email is required. Apply html tags to the message. + if [ "$admin_mail_html" -eq 1 ] + then + # Insert 'br' tags at each ending of lines. + ynh_replace_string "$" "
" mail_to_send + + # Insert starting HTML tags + sed --in-place '1s@^@\n\n\n\n@' mail_to_send + + # Keep tabulations + ynh_replace_string " " "\ \ " mail_to_send + ynh_replace_string "\t" "\ \ " mail_to_send + + # Insert url links tags + ynh_replace_string "__URL_TAG1__\(.*\)__URL_TAG2__\(.*\)__URL_TAG3__" "\1" mail_to_send + + # Insert pre tags + ynh_replace_string "__PRE_TAG1__" "
" mail_to_send
+		ynh_replace_string "__PRE_TAG2__" "<\pre>" mail_to_send
+
+		# Insert finishing HTML tags
+		echo -e "\n\n" >> mail_to_send
+
+	# Otherwise, remove tags to keep a plain text.
+	else
+		# Remove URL tags
+		ynh_replace_string "__URL_TAG[1,3]__" "" mail_to_send
+		ynh_replace_string "__URL_TAG2__" ": " mail_to_send
+
+		# Remove PRE tags
+		ynh_replace_string "__PRE_TAG[1-2]__" "" mail_to_send
+	fi
+
+	# Define binary to use for mail command
+	if [ -e /usr/bin/bsd-mailx ]
+	then
+		local mail_bin=/usr/bin/bsd-mailx
+	else
+		local mail_bin=/usr/bin/mail.mailutils
+	fi
+
+	if [ "$admin_mail_html" -eq 1 ]
+	then
+		content_type="text/html"
+	else
+		content_type="text/plain"
+	fi
+
+	# Send the email to the recipients
+	cat mail_to_send | $mail_bin -a "Content-Type: $content_type; charset=UTF-8" -s "$mail_subject" "$recipients"
+}

From 3d81fbcd984de039e8312be881be2a0a7a6cfcc4 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 06:19:13 +0200
Subject: [PATCH 02/31] fix version

---
 README.md     | 2 +-
 manifest.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 448497c..16314cf 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This is the reloaded version of the open source timetracker Kimai. Right now its
 Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE).
 https://github.com/kevinpapst/kimai2
 
-Shipped Version: **0.8.1 (pre-release)**
+Shipped Version: **1.8**
 
 ## Screenshots
 
diff --git a/manifest.json b/manifest.json
index 7fe8436..10b636f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
         "de": "Eine web-basierte Mehrbenutzer-Zeiterfassung mit Rechnungsdruck mit Unterstützung für mobile Endgeräte",
         "cs": "Víceuživatelská webová aplikace pro sledování času s podporou mobilních zařízení"
     },
-    "version": "0.8.1~ynh1",
+    "version": "1.8~ynh1",
     "url": "https://v2.kimai.org",
     "license": "MIT",
     "maintainer": {

From 45c279c555ad1b3ea9fb3a02105368796c8e95b0 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 06:19:32 +0200
Subject: [PATCH 03/31] fix nginx / php-fpm

---
 conf/nginx.conf   | 2 +-
 conf/php-fpm.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 5a98c4f..f5e8855 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,5 +1,5 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
-location ^~ __PATH__ {
+location __PATH__/ {
 
   # Path to source
   alias __FINALPATH__/public/;
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index db3ac1d..9d360d2 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -358,7 +358,7 @@ request_terminate_timeout = 1d
 ; Chdir to this directory at the start.
 ; Note: relative path can be used.
 ; Default Value: current directory or / when chroot
-chdir = __FINALPATH__/public
+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.

From f318d4a4ba23993e4c4a35e404e5f02d19869268 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 17:06:36 +0200
Subject: [PATCH 04/31] Removing DATABASE_PREFIX

---
 conf/.env.mysql  | 1 -
 conf/.env.sqlite | 1 -
 2 files changed, 2 deletions(-)

diff --git a/conf/.env.mysql b/conf/.env.mysql
index 6c6ff45..c49f744 100644
--- a/conf/.env.mysql
+++ b/conf/.env.mysql
@@ -13,7 +13,6 @@ APP_SECRET=__RANDOM_KEY__
 # Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
 # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data/kimai.sqlite"
 # Configure your db driver and server_version in config/packages/doctrine.yaml
-DATABASE_PREFIX=kimai2_
 DATABASE_URL=mysql://__DB_USER__:__DB_PASSWORD__@127.0.0.1:3306/__DB_NAME__
 # DATABASE_URL=sqlite:///%kernel.project_dir%/var/data/kimai.sqlite
 ###< doctrine/doctrine-bundle ###
diff --git a/conf/.env.sqlite b/conf/.env.sqlite
index b33403b..f06eba7 100644
--- a/conf/.env.sqlite
+++ b/conf/.env.sqlite
@@ -14,7 +14,6 @@ APP_SECRET=__RANDOM_KEY__
 # For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data/kimai.sqlite"
 # Configure your db driver and server_version in config/packages/doctrine.yaml
 # DATABASE_URL=mysql://__DB_USER__:__DB_PASSWORD__@127.0.0.1:3306/__DB_NAME__
-DATABASE_PREFIX=kimai2_
 DATABASE_URL=sqlite:///%kernel.project_dir%/var/data/kimai.sqlite
 ###< doctrine/doctrine-bundle ###
 

From f47e4469995eb2b54856b9b9e5da4e810991de63 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 17:19:15 +0200
Subject: [PATCH 05/31] Cleanup

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

diff --git a/scripts/install b/scripts/install
index 76721ff..2ee5d02 100755
--- a/scripts/install
+++ b/scripts/install
@@ -18,7 +18,6 @@ source /usr/share/yunohost/helpers
 ynh_print_info --message="Managing script failure..."
 
 ynh_clean_setup () {
-	read -p "key"
 	true
 }
 # Exit if an error occurs during the execution of the script

From bf7ffa001c4bae190a496b6a792ea1cb9b90580b Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 17:59:42 +0200
Subject: [PATCH 06/31] Moving to git release

---
 conf/app.src            |  8 +++----
 scripts/_common.sh      |  3 ++-
 scripts/install         | 11 ++++++++++
 scripts/restore         |  8 +++++++
 scripts/upgrade         | 11 ++++++++++
 scripts/ynh_composer__2 | 48 +++++++++++++++++++++++++++++++++++++++++
 6 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100644 scripts/ynh_composer__2

diff --git a/conf/app.src b/conf/app.src
index 5d4b0d5..3e65fcd 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/kevinpapst/kimai2/releases/download/1.8/kimai-release-1.8.zip
-SOURCE_SUM=c4de84b78102d30e858746f107839fe4144c80a31bbfb84e8476f95258be1c0c
+SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/1.8.tar.gz
+SOURCE_SUM=b5133d4dc98a360042fdbd9ac054b72ad9db3ce274ee733981375610ab7f46ef
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=zip
-SOURCE_IN_SUBDIR=false
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
 SOURCE_FILENAME=
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2ba000d..dee186b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,7 +7,8 @@
 # dependencies used by the app
 pkg_dependencies=""
 
-extra_pkg_dependencies="php7.3-mbstring php7.3-gd php7.3-intl php7.3-pdo php7.3-xml php7.3-zip php7.3-xsl php7.3-ldap php7.3-mysql php7.3-sqlite3 php7.3-ctype php7.3-iconv php7.3-json php7.3-cli php7.3-simplexml php7.3-tokenizer"
+extra_pkg_dependencies="php7.3-gd php7.3-intl php7.3-json php7.3-mbstring php7.3-pdo php7.3-zip php7.3-xml php7.3-xsl php7.3-ldap php7.3-mysql php7.3-sqlite3"
+#  php7.3-ctype php7.3-iconv php7.3-cli php7.3-simplexml php7.3-tokenizer php7.3-common php7.3-curl
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 2ee5d02..fe33533 100755
--- a/scripts/install
+++ b/scripts/install
@@ -9,6 +9,7 @@
 source _common.sh
 source ynh_add_extra_apt_repos__3
 source ynh_install_php__3
+source ynh_composer__2
 source ynh_send_readme_to_admin__2
 source /usr/share/yunohost/helpers
 
@@ -77,6 +78,13 @@ else
 	ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies"
 fi
 
+#=================================================
+# INSTALL DEPENDENCIES
+#=================================================
+ynh_print_info --message="Installing dependencies..."
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -144,6 +152,9 @@ fi
 #=================================================
 ynh_print_info --message="Building Kimai 2..."
 
+ynh_install_composer --phpversion="7.3" --workdir="$final_path"
+ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="install --no-dev --optimize-autoloader"
+
 pushd "$final_path"
 	php7.3 bin/console kimai:install -n
 popd
diff --git a/scripts/restore b/scripts/restore
index 46c3219..77406ab 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -90,6 +90,14 @@ else
 	ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies"
 fi
 
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_print_info --message="Reinstalling dependencies..."
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 5c4b983..a8f0ec0 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,6 +9,7 @@
 source _common.sh
 source ynh_add_extra_apt_repos__3
 source ynh_install_php__3
+source ynh_composer__2
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -134,6 +135,13 @@ ynh_print_info --message="Upgrading nginx web server configuration..."
 # Create a dedicated nginx config
 ynh_add_nginx_config
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_print_info --message="Upgrading dependencies..."
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -187,6 +195,9 @@ fi
 #=================================================
 ynh_print_info --message="Upgrading Kimai 2..."
 
+ynh_install_composer --phpversion="7.3" --workdir="$final_path"
+ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="install --no-dev --optimize-autoloader"
+
 pushd "$final_path"
 	php7.3 bin/console kimai:update
 popd
diff --git a/scripts/ynh_composer__2 b/scripts/ynh_composer__2
new file mode 100644
index 0000000..1b6aa80
--- /dev/null
+++ b/scripts/ynh_composer__2
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Execute a command with Composer
+#
+# usage: ynh_composer_exec --phpversion=phpversion [--workdir=$final_path] --commands="commands"
+# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
+# | arg: -c, --commands - Commands to execute.
+ynh_composer_exec () {
+	# Declare an array to define the options of this helper.
+	local legacy_args=vwc
+	declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= )
+	local phpversion
+	local workdir
+	local commands
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	workdir="${workdir:-$final_path}"
+	phpversion="${phpversion:-7.0}"
+
+	COMPOSER_HOME="$workdir/.composer" \
+		php${phpversion} "$workdir/composer.phar" $commands \
+		-d "$workdir" --quiet --no-interaction
+}
+
+# Install and initialize Composer in the given directory
+#
+# usage: ynh_install_composer --phpversion=phpversion [--workdir=$final_path]
+# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
+ynh_install_composer () {
+	# Declare an array to define the options of this helper.
+	local legacy_args=vw
+	declare -Ar args_array=( [v]=phpversion= [w]=workdir= )
+	local phpversion
+	local workdir
+	# Manage arguments with getopts
+	ynh_handle_getopts_args "$@"
+	workdir="${workdir:-$final_path}"
+	phpversion="${phpversion:-7.0}"
+
+	curl -sS https://getcomposer.org/installer \
+		| COMPOSER_HOME="$workdir/.composer" \
+		php${phpversion} -- --quiet --install-dir="$workdir" \
+		|| ynh_die "Unable to install Composer."
+
+	# update dependencies to create composer.lock
+	ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev" \
+		|| ynh_die "Unable to update core dependencies with Composer."
+}

From b8f47351c6d8527b180f44df738ff297278fc213 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 18:36:28 +0200
Subject: [PATCH 07/31] Fix ldap

---
 README.md       | 24 +++++++++++++++++-------
 conf/local.yaml | 10 +++++++---
 scripts/install |  8 +++++++-
 scripts/upgrade |  7 +++++--
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 16314cf..76215ce 100644
--- a/README.md
+++ b/README.md
@@ -25,16 +25,26 @@ Shipped Version: **1.8**
 ### Guidelines 
 
  1. Require dedicated domain like **kimai.domain.tld**.
- 1. No LDAP support (blocked until upstream implements it)
  1. This app is multi-instance (you can have more then one Kimai instance running on a YunoHost server)
- 
- ### Install
-
- 1. **App can be installed by YunoHost admin interface or by the following command:**
-
-         $ sudo yunohost app install https://github.com/YunoHost-Apps/kimai2_ynh
  1. Login details will be sent to the admin email.
 
+## Documentation
+
+ * Official documentation: https://www.kimai.org/documentation
+
+## YunoHost specific features
+
+#### Multi-users support
+
+LDAP is supported
+HTTP auth is not supporter
+Defaul Kimai2 roles are:
+* ROLE_USER
+* ROLE_TEAMLEAD
+* ROLE_ADMIN
+* ROLE_SUPER_ADMIN
+Those roles are directly managed using YunoHost permission system. User choosen during installation is granted the ROLE_SUPER_ADMIN
+
 #### Supported architectures
 
 * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/kimai2%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/kimai2/)
diff --git a/conf/local.yaml b/conf/local.yaml
index af25095..1593c47 100644
--- a/conf/local.yaml
+++ b/conf/local.yaml
@@ -123,7 +123,7 @@ kimai:
         role:
             # baseDn to query for groups, MUST be set to activate the "group import"
             # default: empty (deactivated)
-            baseDn: ou=groups, dc=kimai, dc=org
+            baseDn: ou=permission, dc=yunohost, dc=org
             
             # Filter to query user groups, all results will be matched against 
             # the configured "groups" mapping below.
@@ -132,7 +132,7 @@ kimai:
             # The following example rule will be expanded to (for user "foo"):
             # (&(&(objectClass=groupOfNames))(member=foo))
             # default: empty
-            filter: (&(objectClass=groupOfNames))
+            filter: (&(objectClass=posixGroup))
               
             # The following field is taken from the LDAP user entry and its 
             # value is used in the filter above as "valueOfUsernameAttribute".
@@ -154,7 +154,11 @@ kimai:
             # Convert LDAP group name (nameAttribute) to Kimai role
             # You will very likely have to define mappings, unless your groups
             # are called "teamlead", "admin" or "super_admin"
-            #groups:
+            groups:
             #    - { ldap_value: group1, role: ROLE_TEAMLEAD }
             #    - { ldap_value: kimai_admin, role: ROLE_ADMIN }
+                - { ldap_value: __APP__.main, role: ROLE_USER }
+                - { ldap_value: __APP__.teamlead, role: ROLE_TEAMLEAD }
+                - { ldap_value: __APP__.admin, role: ROLE_ADMIN }
+                - { ldap_value: __APP__.super_admin, role: ROLE_SUPER_ADMIN }
 
diff --git a/scripts/install b/scripts/install
index fe33533..ba33256 100755
--- a/scripts/install
+++ b/scripts/install
@@ -119,6 +119,7 @@ ynh_print_info --message="Configuring Kimai 2..."
 
 # Configure registration
 sudo cp ../conf/local.yaml $final_path/config/packages/local.yaml
+ynh_replace_string "__APP__" "$app" "$final_path/config/packages/local.yaml"
 if [ $registration -eq 1  ]
 then
 	ynh_replace_string "__REGISTRATION__" "true" "$final_path/config/packages/local.yaml"
@@ -154,6 +155,7 @@ ynh_print_info --message="Building Kimai 2..."
 
 ynh_install_composer --phpversion="7.3" --workdir="$final_path"
 ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="install --no-dev --optimize-autoloader"
+ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="require zendframework/zend-ldap"
 
 pushd "$final_path"
 	php7.3 bin/console kimai:install -n
@@ -190,11 +192,15 @@ chown -R $app: $final_path
 #=================================================
 ynh_print_info --message="Configuring SSOwat..."
 
+ynh_permission_create --permission="teamlead"
+ynh_permission_create --permission="admin"
+ynh_permission_create --permission="super_admin" --allowed "$admin"
+
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
 	# unprotected_uris allows SSO credentials to be passed anyway.
-	ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
+	ynh_permission_update --permission "main" --add "visitors"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index a8f0ec0..09606b5 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -197,6 +197,7 @@ ynh_print_info --message="Upgrading Kimai 2..."
 
 ynh_install_composer --phpversion="7.3" --workdir="$final_path"
 ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="install --no-dev --optimize-autoloader"
+ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="require zendframework/zend-ldap"
 
 pushd "$final_path"
 	php7.3 bin/console kimai:update
@@ -226,11 +227,13 @@ chown -R $app: $final_path
 #=================================================
 ynh_print_info --message="Upgrading SSOwat configuration..."
 
+ynh_permission_create --permission="super_admin" --allowed "$admin"
+
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-	# unprotected_uris allows SSO credentials to be passed anyway
-	ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
+	# unprotected_uris allows SSO credentials to be passed anyway.
+	ynh_permission_update --permission "main" --add "visitors"
 fi
 
 #=================================================

From 1075ecd9e908888cc2644d68637a5153aadac809 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 18:50:47 +0200
Subject: [PATCH 08/31] fix ldap mail

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

diff --git a/conf/local.yaml b/conf/local.yaml
index 1593c47..e59c582 100644
--- a/conf/local.yaml
+++ b/conf/local.yaml
@@ -111,7 +111,7 @@ kimai:
                 # Username is set to the value of the configured "usernameAttribute" field 
                 - { ldap_attr: "usernameAttribute", user_method: setUsername }
                 # Only applied if you don't configure a mapping for setEmail()
-                - { ldap_attr: "usernameAttribute", user_method: setEmail }
+                - { ldap_attr: mail, user_method: setEmail }
                 # An example which will set the display name in Kimai from the 
                 # value of the "common name" field in your LDAP
                 - { ldap_attr: cn, user_method: setAlias }

From aa0497dc149d6477f5c8609fe40ac043320507fb Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 20:09:33 +0200
Subject: [PATCH 09/31] Fix Role/Permissions

---
 conf/local.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/local.yaml b/conf/local.yaml
index e59c582..ef8501e 100644
--- a/conf/local.yaml
+++ b/conf/local.yaml
@@ -139,17 +139,17 @@ kimai:
             # The attribute must be given in lowercase!
             # The example below uses "posix group style memberUid". 
             # default: dn
-            #usernameAttribute: uid
+            usernameAttribute: uid
             
             # Field that holds the group name, which will be used to map the 
             # LDAP groups with Kimai roles (see groups mapping below).
             # default: cn
-            #nameAttribute: cn
+            nameAttribute: cn
             
             # Field that holds the users dn in your LDAP group definition.
             # Value of this configuration is used in the filter (see above).
             # default: member
-            #userDnAttribute: member
+            userDnAttribute: groupPermission
             
             # Convert LDAP group name (nameAttribute) to Kimai role
             # You will very likely have to define mappings, unless your groups

From 47c45ec271eaf72330c23b561f4ef5c979e4e8cf Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 21:49:35 +0200
Subject: [PATCH 10/31] Fix groups

---
 conf/local.yaml | 12 ++++++------
 scripts/install |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/conf/local.yaml b/conf/local.yaml
index ef8501e..23f621d 100644
--- a/conf/local.yaml
+++ b/conf/local.yaml
@@ -132,14 +132,14 @@ kimai:
             # The following example rule will be expanded to (for user "foo"):
             # (&(&(objectClass=groupOfNames))(member=foo))
             # default: empty
-            filter: (&(objectClass=posixGroup))
+            filter: (&(objectClass=posixGroup)(cn=__APP__*)) 
               
             # The following field is taken from the LDAP user entry and its 
             # value is used in the filter above as "valueOfUsernameAttribute".
             # The attribute must be given in lowercase!
             # The example below uses "posix group style memberUid". 
             # default: dn
-            usernameAttribute: uid
+            usernameAttribute: cn
             
             # Field that holds the group name, which will be used to map the 
             # LDAP groups with Kimai roles (see groups mapping below).
@@ -157,8 +157,8 @@ kimai:
             groups:
             #    - { ldap_value: group1, role: ROLE_TEAMLEAD }
             #    - { ldap_value: kimai_admin, role: ROLE_ADMIN }
-                - { ldap_value: __APP__.main, role: ROLE_USER }
-                - { ldap_value: __APP__.teamlead, role: ROLE_TEAMLEAD }
-                - { ldap_value: __APP__.admin, role: ROLE_ADMIN }
-                - { ldap_value: __APP__.super_admin, role: ROLE_SUPER_ADMIN }
+                - { ldap_value: "__APP__.main", role: ROLE_USER }
+                - { ldap_value: "__APP__.teamlead", role: ROLE_TEAMLEAD }
+                - { ldap_value: "__APP__.admin, role": ROLE_ADMIN }
+                - { ldap_value: "__APP__.super_admin", role: ROLE_SUPER_ADMIN }
 
diff --git a/scripts/install b/scripts/install
index ba33256..74f6ba7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -192,8 +192,9 @@ chown -R $app: $final_path
 #=================================================
 ynh_print_info --message="Configuring SSOwat..."
 
-ynh_permission_create --permission="teamlead"
-ynh_permission_create --permission="admin"
+ynh_permission_update --permission "main" --add "$admin"
+ynh_permission_create --permission="teamlead" --allowed "$admin"
+ynh_permission_create --permission="admin" --allowed "$admin"
 ynh_permission_create --permission="super_admin" --allowed "$admin"
 
 # Make app public if necessary

From 0a575071cdc438264ea73d842502cdff856a0d82 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 18 Apr 2020 22:47:38 +0200
Subject: [PATCH 11/31] Typo

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

diff --git a/conf/local.yaml b/conf/local.yaml
index 23f621d..8b189bf 100644
--- a/conf/local.yaml
+++ b/conf/local.yaml
@@ -159,6 +159,6 @@ kimai:
             #    - { ldap_value: kimai_admin, role: ROLE_ADMIN }
                 - { ldap_value: "__APP__.main", role: ROLE_USER }
                 - { ldap_value: "__APP__.teamlead", role: ROLE_TEAMLEAD }
-                - { ldap_value: "__APP__.admin, role": ROLE_ADMIN }
+                - { ldap_value: "__APP__.admin", role: ROLE_ADMIN }
                 - { ldap_value: "__APP__.super_admin", role: ROLE_SUPER_ADMIN }
 

From 93d65042f8db8a8f3798adc2908aee51a5adca97 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 19 Apr 2020 03:48:52 +0200
Subject: [PATCH 12/31] Implement YunoHost permissions for Kimai Roles

---
 conf/local.yaml         |  7 +++----
 manifest.json           |  2 +-
 scripts/install         | 10 ++++------
 scripts/upgrade         |  5 ++---
 scripts/ynh_composer__2 |  8 +++++---
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/conf/local.yaml b/conf/local.yaml
index 8b189bf..797cf81 100644
--- a/conf/local.yaml
+++ b/conf/local.yaml
@@ -132,14 +132,14 @@ kimai:
             # The following example rule will be expanded to (for user "foo"):
             # (&(&(objectClass=groupOfNames))(member=foo))
             # default: empty
-            filter: (&(objectClass=posixGroup)(cn=__APP__*)) 
+            filter: (&(objectClass=posixGroup)(cn=__APP__*))
               
             # The following field is taken from the LDAP user entry and its 
             # value is used in the filter above as "valueOfUsernameAttribute".
             # The attribute must be given in lowercase!
             # The example below uses "posix group style memberUid". 
             # default: dn
-            usernameAttribute: cn
+            usernameAttribute: dn
             
             # Field that holds the group name, which will be used to map the 
             # LDAP groups with Kimai roles (see groups mapping below).
@@ -149,7 +149,7 @@ kimai:
             # Field that holds the users dn in your LDAP group definition.
             # Value of this configuration is used in the filter (see above).
             # default: member
-            userDnAttribute: groupPermission
+            userDnAttribute: inheritPermission
             
             # Convert LDAP group name (nameAttribute) to Kimai role
             # You will very likely have to define mappings, unless your groups
@@ -157,7 +157,6 @@ kimai:
             groups:
             #    - { ldap_value: group1, role: ROLE_TEAMLEAD }
             #    - { ldap_value: kimai_admin, role: ROLE_ADMIN }
-                - { ldap_value: "__APP__.main", role: ROLE_USER }
                 - { ldap_value: "__APP__.teamlead", role: ROLE_TEAMLEAD }
                 - { ldap_value: "__APP__.admin", role: ROLE_ADMIN }
                 - { ldap_value: "__APP__.super_admin", role: ROLE_SUPER_ADMIN }
diff --git a/manifest.json b/manifest.json
index 10b636f..52f5c83 100644
--- a/manifest.json
+++ b/manifest.json
@@ -58,7 +58,7 @@
                     "de": "Ist dies eine öffentliche Applikation?",
                     "cs": "Je tato aplikace veřejná?"
                 },
-                "default": true
+                "default": false
             },
             {
                 "name": "database",
diff --git a/scripts/install b/scripts/install
index 74f6ba7..d90e626 100755
--- a/scripts/install
+++ b/scripts/install
@@ -153,9 +153,8 @@ fi
 #=================================================
 ynh_print_info --message="Building Kimai 2..."
 
-ynh_install_composer --phpversion="7.3" --workdir="$final_path"
-ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="install --no-dev --optimize-autoloader"
-ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="require zendframework/zend-ldap"
+ynh_install_composer --phpversion="7.3" --workdir="$final_path" --install_args="--optimize-autoloader"
+ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
 pushd "$final_path"
 	php7.3 bin/console kimai:install -n
@@ -192,9 +191,8 @@ chown -R $app: $final_path
 #=================================================
 ynh_print_info --message="Configuring SSOwat..."
 
-ynh_permission_update --permission "main" --add "$admin"
-ynh_permission_create --permission="teamlead" --allowed "$admin"
-ynh_permission_create --permission="admin" --allowed "$admin"
+ynh_permission_create --permission="teamlead"
+ynh_permission_create --permission="admin"
 ynh_permission_create --permission="super_admin" --allowed "$admin"
 
 # Make app public if necessary
diff --git a/scripts/upgrade b/scripts/upgrade
index 09606b5..0dbb5b4 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -195,9 +195,8 @@ fi
 #=================================================
 ynh_print_info --message="Upgrading Kimai 2..."
 
-ynh_install_composer --phpversion="7.3" --workdir="$final_path"
-ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="install --no-dev --optimize-autoloader"
-ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="require zendframework/zend-ldap"
+ynh_install_composer --phpversion="7.3" --workdir="$final_path" --install_args="--optimize-autoloader"
+ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
 pushd "$final_path"
 	php7.3 bin/console kimai:update
diff --git a/scripts/ynh_composer__2 b/scripts/ynh_composer__2
index 1b6aa80..ed22cab 100644
--- a/scripts/ynh_composer__2
+++ b/scripts/ynh_composer__2
@@ -24,14 +24,16 @@ ynh_composer_exec () {
 
 # Install and initialize Composer in the given directory
 #
-# usage: ynh_install_composer --phpversion=phpversion [--workdir=$final_path]
+# usage: ynh_install_composer --phpversion=phpversion [--workdir=$final_path] [--install_args="--optimize-autoloader"]
 # | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
+# | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include
 ynh_install_composer () {
 	# Declare an array to define the options of this helper.
 	local legacy_args=vw
-	declare -Ar args_array=( [v]=phpversion= [w]=workdir= )
+	declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args=)
 	local phpversion
 	local workdir
+	local install_args
 	# Manage arguments with getopts
 	ynh_handle_getopts_args "$@"
 	workdir="${workdir:-$final_path}"
@@ -43,6 +45,6 @@ ynh_install_composer () {
 		|| ynh_die "Unable to install Composer."
 
 	# update dependencies to create composer.lock
-	ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev" \
+	ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \
 		|| ynh_die "Unable to update core dependencies with Composer."
 }

From 772741f4d88b4dc05b177ccb3a4222c616f09cb0 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 19 Apr 2020 03:51:21 +0200
Subject: [PATCH 13/31] Adding Yunohost permission informaiton

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 76215ce..f4473cd 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,9 @@ LDAP is supported
 HTTP auth is not supporter
 Defaul Kimai2 roles are:
 * ROLE_USER
-* ROLE_TEAMLEAD
-* ROLE_ADMIN
-* ROLE_SUPER_ADMIN
+* ROLE_TEAMLEAD => Kimai2 (Teamlead) YunoHost permission
+* ROLE_ADMIN => Kimai2 (Admin) YunoHost permission
+* ROLE_SUPER_ADMIN => Kimai2 (Super_Admin) YunoHost permission
 Those roles are directly managed using YunoHost permission system. User choosen during installation is granted the ROLE_SUPER_ADMIN
 
 #### Supported architectures

From 53b9baa0a5a81889ec845afd5c738324aa0fb550 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 19 Apr 2020 15:04:01 +0200
Subject: [PATCH 14/31] Typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f4473cd..811ea6f 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Shipped Version: **1.8**
 #### Multi-users support
 
 LDAP is supported
-HTTP auth is not supporter
+HTTP auth is not supported
 Defaul Kimai2 roles are:
 * ROLE_USER
 * ROLE_TEAMLEAD => Kimai2 (Teamlead) YunoHost permission

From 16c3f101526ee6c3b1df0a93db6e4ab62db45212 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 19 Apr 2020 15:08:55 +0200
Subject: [PATCH 15/31] backup of /var/data during upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 0dbb5b4..c4c059f 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -105,9 +105,8 @@ then
 	if [ -d $final_path/var/invoices ]; then
 		cp -af "$final_path/var/invoices" "$tmpdir/."
 	fi
-	if [ -f $final_path/var/data/kimai.sqlite ]; then
-		cp -a "$final_path/var/data/kimai.sqlite" "$tmpdir/."
-		ynh_app_setting_set $app database "sqlite"
+	if [ -d $final_path/var/data ]; then
+		cp -af "$final_path/var/data" "$tmpdir/."
 	fi
 	
 	# Download, check integrity, uncompress and patch the source from app.src
@@ -120,8 +119,8 @@ then
 	if [ -d $tmpdir/invoices ]; then
 		cp -af "$tmpdir/invoices" "$final_path/var/."
 	fi
-	if [ -f $tmpdir/kimai.sqlite ]; then
-	sudo cp -af "$tmpdir/kimai.sqlite" "$final_path/var/data/."
+	if [ -d $tmpdir/data ]; then
+		cp -af "$tmpdir/data" "$final_path/var/."
 	fi
 	
 	ynh_secure_remove --file="$tmpdir"

From d44cfc271a7f8975ec87cc6e005eccb2a09e2a28 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 19 Apr 2020 16:36:08 +0200
Subject: [PATCH 16/31] Purging Kimai2 during upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index c4c059f..04a09f0 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -109,6 +109,8 @@ then
 		cp -af "$final_path/var/data" "$tmpdir/."
 	fi
 	
+	ynh_secure_remove --file="$final_path"
+	
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path"
 	

From cbe6e044c127a4a3f2bdcf4fd9864768ea448248 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 19 Apr 2020 19:37:20 +0200
Subject: [PATCH 17/31] Upgrade nginx configuration

---
 conf/nginx.conf   | 20 +++++++++-----------
 conf/php-fpm.conf |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index f5e8855..d698030 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,35 +1,33 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
+root __FINALPATH__/public/ ;
+
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/public/;
-  
+  # alias __FINALPATH__/public/ ;
+
   # Force usage of https
   if ($scheme = http) {
     rewrite ^ https://$server_name$request_uri? permanent;
   }
 
-  index index.php index.htm index.html;
+  index index.php;
 
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
   #client_max_body_size 50M;
 
-  try_files $uri $uri/ @kimai;
-  location ~ \.php {
+  try_files $uri $uri/ /index.php$is_args$args;
+  location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php/php7.3-fpm-__NAME__.sock;
 
     fastcgi_index index.php;
     include fastcgi_params;
-    fastcgi_param REMOTE_USER     $remote_user;
-    fastcgi_param PATH_INFO       $fastcgi_path_info;
+    fastcgi_param REMOTE_USER $remote_user;
+    fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param SCRIPT_FILENAME $request_filename;
   }
 
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
 }
-
-location @kimai {
-    rewrite /(.*)$ /index.php?/$1 last;
-}
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 9d360d2..db3ac1d 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -358,7 +358,7 @@ request_terminate_timeout = 1d
 ; Chdir to this directory at the start.
 ; Note: relative path can be used.
 ; Default Value: current directory or / when chroot
-chdir = __FINALPATH__
+chdir = __FINALPATH__/public
 
 ; 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.

From 2c20bd4065c6760c06a2b03e2c91a508855483c6 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 19 Apr 2020 20:34:05 +0200
Subject: [PATCH 18/31] Cleanup

---
 README.md                           |   1 -
 conf/message                        |   8 --
 manifest.json                       |   4 +-
 scripts/_common.sh                  |   1 -
 scripts/backup                      |   2 +-
 scripts/install                     |  61 +++++-------
 scripts/remove                      |   2 +-
 scripts/restore                     |   1 +
 scripts/upgrade                     |  58 ++++++------
 scripts/ynh_send_readme_to_admin__2 | 140 ----------------------------
 10 files changed, 59 insertions(+), 219 deletions(-)
 delete mode 100644 conf/message
 delete mode 100644 scripts/ynh_send_readme_to_admin__2

diff --git a/README.md b/README.md
index 811ea6f..6b234bc 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,6 @@ Shipped Version: **1.8**
 
  1. Require dedicated domain like **kimai.domain.tld**.
  1. This app is multi-instance (you can have more then one Kimai instance running on a YunoHost server)
- 1. Login details will be sent to the admin email.
 
 ## Documentation
 
diff --git a/conf/message b/conf/message
deleted file mode 100644
index a5b743c..0000000
--- a/conf/message
+++ /dev/null
@@ -1,8 +0,0 @@
-__APP__ was successfully installed :)
-
-Please open your __APP__ domain: https://__DOMAIN____PATH_URL__
-
-The admin username is: __ADMIN_EMAIL__
-The admin password is: __ADMIN_PASS__
-
-If you facing any issue or want to improve the app, please open a new issue on the project page: https://github.com/YunoHost-Apps/kimai2_yn
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 52f5c83..c593b13 100644
--- a/manifest.json
+++ b/manifest.json
@@ -33,8 +33,8 @@
                 "ask": {
                     "en": "Choose a domain name for Kimai2",
                     "fr": "Choisissez un nom de domaine pour Kimai2",
-                    "de": "Wählen Sie einen Domainnamen für Kimai 2",
-                    "cs": "Zvolte doménu pro Kimai 2"
+                    "de": "Wählen Sie einen Domainnamen für Kimai2",
+                    "cs": "Zvolte doménu pro Kimai2"
                 },
                 "example": "kimai2.example.com"
             },
diff --git a/scripts/_common.sh b/scripts/_common.sh
index dee186b..e40ce05 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,7 +8,6 @@
 pkg_dependencies=""
 
 extra_pkg_dependencies="php7.3-gd php7.3-intl php7.3-json php7.3-mbstring php7.3-pdo php7.3-zip php7.3-xml php7.3-xsl php7.3-ldap php7.3-mysql php7.3-sqlite3"
-#  php7.3-ctype php7.3-iconv php7.3-cli php7.3-simplexml php7.3-tokenizer php7.3-common php7.3-curl
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/backup b/scripts/backup
index 6641144..203a532 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -18,7 +18,6 @@ ynh_print_info --message="Managing script failure..."
 ynh_clean_setup () {
 	true
 }
-
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
@@ -61,6 +60,7 @@ ynh_backup --src_path="/etc/php/7.3/fpm/pool.d/$app.conf"
 #=================================================
 
 if [ "$database" = "mysql" ]; then
+	ynh_print_info --message="Backing up the MySQL database..."
 	db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 	ynh_mysql_dump_db --database="$db_name" > db.sql
 
diff --git a/scripts/install b/scripts/install
index d90e626..7104748 100755
--- a/scripts/install
+++ b/scripts/install
@@ -10,7 +10,6 @@ source _common.sh
 source ynh_add_extra_apt_repos__3
 source ynh_install_php__3
 source ynh_composer__2
-source ynh_send_readme_to_admin__2
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -35,9 +34,7 @@ admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
 registration=$YNH_APP_ARG_REGISTRATION
 database=$YNH_APP_ARG_DATABASE
-admin_pass=$(ynh_string_random 24)
 random_key=$(ynh_string_random 32)
-admin_email=$(ynh_user_get_info $admin 'mail')
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -61,15 +58,16 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
 ynh_app_setting_set --app=$app --key=is_public --value=$is_public
-ynh_app_setting_set --app=$app --key=random_key --value=$random_key
 ynh_app_setting_set --app=$app --key=registration --value=$registration
 ynh_app_setting_set --app=$app --key=database --value=$database
+ynh_app_setting_set --app=$app --key=random_key --value=$random_key
 
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
 # INSTALL PHP7.3
 #=================================================
+ynh_print_info --message="Installing PHP7.3..."
 
 if [ "$(lsb_release --codename --short)" = "buster" ]; then
 	pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
@@ -113,45 +111,46 @@ ynh_system_user_create --username=$app
 #=================================================
 # SPECIFIC SETUP
 #=================================================
-# CONFIGURE KIMAI 2
+# CONFIGURE KIMAI2
 #=================================================
-ynh_print_info --message="Configuring Kimai 2..."
+ynh_print_info --message="Configuring Kimai2..."
 
+local_conf="$final_path/config/packages/local.yaml"
 # Configure registration
-sudo cp ../conf/local.yaml $final_path/config/packages/local.yaml
-ynh_replace_string "__APP__" "$app" "$final_path/config/packages/local.yaml"
+sudo cp ../conf/local.yaml $local_conf
+ynh_replace_string  --match_string="__APP__" "$app" --target_file="$local_conf"
 if [ $registration -eq 1  ]
 then
-	ynh_replace_string "__REGISTRATION__" "true" "$final_path/config/packages/local.yaml"
+	ynh_replace_string  --match_string="__REGISTRATION__" --replace_string="true" --target_file="$local_conf"
 else
-	ynh_replace_string "__REGISTRATION__" "false" "$final_path/config/packages/local.yaml"
+	ynh_replace_string  --match_string="__REGISTRATION__" --replace_string="false" --target_file="$local_conf"
 fi
 
-env_conf=$final_path/.env
+env_conf="$final_path/.env"
 # Configure environement
 if [ "$database" = "mysql" ]; then
 	# setup application config
 	sudo  cp ../conf/.env.mysql $env_conf
-	db_name=$(ynh_sanitize_dbid $app)
-	ynh_app_setting_set $app db_name $db_name
-	ynh_mysql_setup_db $db_name $db_name
-	
-	ynh_replace_string "__RANDOM_KEY__"  "$random_key" "$env_conf"
-	ynh_replace_string "__DOMAIN__"      "$domain"     "$env_conf"
-	ynh_replace_string "__DB_PASSWORD__" "$db_pwd"     "$env_conf"
-	ynh_replace_string "__DB_USER__"     "$db_name"    "$env_conf"
-	ynh_replace_string "__DB_NAME__"     "$db_name"    "$env_conf"
+	db_name=$(ynh_sanitize_dbid --db_name=$app)
+	db_user=$db_name
+	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
+	ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name	
+	ynh_replace_string  --match_string="__RANDOM_KEY__" --replace_string="$random_key" --target_file="$env_conf"
+	ynh_replace_string  --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$env_conf"
+	ynh_replace_string  --match_string="__DB_PASSWORD__" --replace_string="$db_pwd" --target_file="$env_conf"
+	ynh_replace_string  --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$env_conf"
+	ynh_replace_string  --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$env_conf"
 else
 	# setup application config
 	sudo  cp ../conf/.env.sqlite $env_conf
-	ynh_replace_string "__RANDOM_KEY__"  "$random_key" "$env_conf"
-	ynh_replace_string "__DOMAIN__"      "$domain"     "$env_conf"
+	ynh_replace_string  --match_string="__RANDOM_KEY__" --replace_string="$random_key" --target_file="$env_conf"
+	ynh_replace_string  --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$env_conf"
 fi
 
 #=================================================
-# BUILD KIMAI 2
+# BUILD KIMAI2
 #=================================================
-ynh_print_info --message="Building Kimai 2..."
+ynh_print_info --message="Building Kimai2..."
 
 ynh_install_composer --phpversion="7.3" --workdir="$final_path" --install_args="--optimize-autoloader"
 ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="require laminas/laminas-ldap"
@@ -166,6 +165,7 @@ popd
 ynh_print_info --message="Storing the config file checksum..."
 
 # Calculate and store the config file checksum into the app settings
+ynh_store_file_checksum --file="$local_conf"
 ynh_store_file_checksum --file="$env_conf"
 
 #=================================================
@@ -209,19 +209,6 @@ ynh_print_info --message="Reloading nginx web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
-#=================================================
-# SEND A README FOR THE ADMIN
-#=================================================
-ynh_print_info --message="Sending a readme for the admin..."
-
-ynh_replace_string --match_string="__APP__"    --replace_string="$app"    --target_file="../conf/message"
-ynh_replace_string --match_string="__DOMAIN__"    --replace_string="$domain"    --target_file="../conf/message"
-ynh_replace_string --match_string="__PATH_URL__"    --replace_string="$path_url"    --target_file="../conf/message"
-ynh_replace_string --match_string="__ADMIN_EMAIL__"    --replace_string="$admin_email"    --target_file="../conf/message"
-ynh_replace_string --match_string="__ADMIN_PASS__"    --replace_string="$admin_pass"    --target_file="../conf/message"
-
-ynh_send_readme_to_admin --app_message="../conf/message" --recipients=$admin_email --type='install'
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index d7f7903..fb9f6ae 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -37,7 +37,7 @@ if [ "$database" = "mysql" ]; then
 fi
 
 #=================================================
-# REMOVE PHP
+# REMOVE PHP7.3
 #=================================================
 
 if [ "$(lsb_release --codename --short)" != "buster" ]; then
diff --git a/scripts/restore b/scripts/restore
index 77406ab..3701844 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -82,6 +82,7 @@ chown -R $app: $final_path
 #=================================================
 # REINSTALL PHP7.3
 #=================================================
+ynh_print_info --message="Reinstall PHP7.3..."
 
 if [ "$(lsb_release --codename --short)" = "buster" ]; then
 	pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
diff --git a/scripts/upgrade b/scripts/upgrade
index 04a09f0..6f9aad7 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -24,7 +24,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-database=$(ynh_app_setting_get $app database)
+database=$(ynh_app_setting_get --app=$app --key=database)
 random_key=$(ynh_app_setting_get --app=$app --key=random_key)
 
 #=================================================
@@ -48,7 +48,6 @@ elif [ "$is_public" = "No" ]; then
 	is_public=0
 fi
 
-
 # If final_path doesn't exist, create it
 if [ -z "$final_path" ]; then
 	final_path=/var/www/$app
@@ -162,39 +161,49 @@ ynh_add_fpm_config --phpversion="7.3"
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
-# CONFIGURE KIMAI 2
+# CONFIGURE KIMAI2
 #=================================================
-ynh_print_info --message="Configuring Kimai 2..."
+ynh_print_info --message="Configuring Kimai2..."
+
+local_conf="$final_path/config/packages/local.yaml"
+ynh_backup_if_checksum_is_different "$local_conf"
+sudo cp ../conf/local.yaml $local_conf
+ynh_replace_string  --match_string="__APP__" "$app" --target_file="$local_conf"
+if [ $registration -eq 1  ]
+then
+	ynh_replace_string  --match_string="__REGISTRATION__" --replace_string="true" --target_file="$local_conf"
+else
+	ynh_replace_string  --match_string="__REGISTRATION__" --replace_string="false" --target_file="$local_conf"
+fi
+ynh_store_file_checksum "$local_conf"
 
 env_conf=$final_path/.env
-
-# Verify the checksum and backup the file if it's different
 ynh_backup_if_checksum_is_different "$env_conf"
-
 # Configure environement
 if [ "$database" = "mysql" ]; then
 	# setup application config
 	sudo  cp ../conf/.env.mysql $env_conf
-	db_name=$(ynh_sanitize_dbid $app)
-	ynh_app_setting_set $app db_name $db_name
-	ynh_mysql_setup_db $db_name $db_name
+	db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
+	db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+	db_user=$db_name
 	
-	ynh_replace_string "__RANDOM_KEY__"  "$random_key" "$env_conf"
-	ynh_replace_string "__DOMAIN__"      "$domain"     "$env_conf"
-	ynh_replace_string "__DB_PASSWORD__" "$db_pwd"     "$env_conf"
-	ynh_replace_string "__DB_USER__"     "$db_name"    "$env_conf"
-	ynh_replace_string "__DB_NAME__"     "$db_name"    "$env_conf"
+	ynh_replace_string --match_string="__RANDOM_KEY__" --replace_string="$random_key" --target_file="$env_conf"
+	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$env_conf"
+	ynh_replace_string --match_string="__DB_PASSWORD__" --replace_string="$db_pwd" --target_file="$env_conf"
+	ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$env_conf"
+	ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$env_conf"
 else
 	# setup application config
 	sudo  cp ../conf/.env.sqlite $env_conf
-	ynh_replace_string "__RANDOM_KEY__"  "$random_key" "$env_conf"
-	ynh_replace_string "__DOMAIN__"      "$domain"     "$env_conf"
+	ynh_replace_string --match_string="__RANDOM_KEY__" --replace_string="$random_key" --target_file="$env_conf"
+	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$env_conf"
 fi
+ynh_store_file_checksum "$env_conf"
 
 #=================================================
-# UPGRADE KIMAI 2
+# UPGRADE KIMAI2
 #=================================================
-ynh_print_info --message="Upgrading Kimai 2..."
+ynh_print_info --message="Upgrading Kimai2..."
 
 ynh_install_composer --phpversion="7.3" --workdir="$final_path" --install_args="--optimize-autoloader"
 ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="require laminas/laminas-ldap"
@@ -203,15 +212,6 @@ pushd "$final_path"
 	php7.3 bin/console kimai:update
 popd
 
-#=================================================
-# STORE THE CONFIG FILE CHECKSUM
-#=================================================
-ynh_print_info --message="Storing the config file checksum..."
-
-
-# Recalculate and store the config file checksum into the app settings
-ynh_store_file_checksum "$env_conf"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
@@ -227,6 +227,8 @@ chown -R $app: $final_path
 #=================================================
 ynh_print_info --message="Upgrading SSOwat configuration..."
 
+ynh_permission_create --permission="teamlead"
+ynh_permission_create --permission="admin"
 ynh_permission_create --permission="super_admin" --allowed "$admin"
 
 # Make app public if necessary
diff --git a/scripts/ynh_send_readme_to_admin__2 b/scripts/ynh_send_readme_to_admin__2
deleted file mode 100644
index 06cff8c..0000000
--- a/scripts/ynh_send_readme_to_admin__2
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/bash
-
-# Send an email to inform the administrator
-#
-# usage: ynh_send_readme_to_admin --app_message=app_message [--recipients=recipients] [--type=type]
-# | arg: -m --app_message= - The file with the content to send to the administrator.
-# | arg: -r, --recipients= - The recipients of this email. Use spaces to separate multiples recipients. - default: root
-#	example: "root admin@domain"
-#	If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you
-#	example: "root admin@domain user1 user2"
-# | arg: -t, --type= - Type of mail, could be 'backup', 'change_url', 'install', 'remove', 'restore', 'upgrade'
-ynh_send_readme_to_admin() {
-	# Declare an array to define the options of this helper.
-	declare -Ar args_array=( [m]=app_message= [r]=recipients= [t]=type= )
-	local app_message
-	local recipients
-	local type
-	# Manage arguments with getopts
-
-	ynh_handle_getopts_args "$@"
-	app_message="${app_message:-}"
-	recipients="${recipients:-root}"
-	type="${type:-install}"
-
-	# Get the value of admin_mail_html
-	admin_mail_html=$(ynh_app_setting_get $app admin_mail_html)
-	admin_mail_html="${admin_mail_html:-0}"
-
-	# Retrieve the email of users
-	find_mails () {
-		local list_mails="$1"
-		local mail
-		local recipients=" "
-		# Read each mail in argument
-		for mail in $list_mails
-		do
-			# Keep root or a real email address as it is
-			if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@"
-			then
-				recipients="$recipients $mail"
-			else
-				# But replace an user name without a domain after by its email
-				if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null)
-				then
-					recipients="$recipients $mail"
-				fi
-			fi
-		done
-		echo "$recipients"
-	}
-	recipients=$(find_mails "$recipients")
-
-	# Subject base
-	local mail_subject="☁️🆈🅽🅷☁️: \`$app\`"
-
-	# Adapt the subject according to the type of mail required.
-	if [ "$type" = "backup" ]; then
-		mail_subject="$mail_subject has just been backup."
-	elif [ "$type" = "change_url" ]; then
-		mail_subject="$mail_subject has just been moved to a new URL!"
-	elif [ "$type" = "remove" ]; then
-		mail_subject="$mail_subject has just been removed!"
-	elif [ "$type" = "restore" ]; then
-		mail_subject="$mail_subject has just been restored!"
-	elif [ "$type" = "upgrade" ]; then
-		mail_subject="$mail_subject has just been upgraded!"
-	else	# install
-		mail_subject="$mail_subject has just been installed!"
-	fi
-
-	local mail_message="This is an automated message from your beloved YunoHost server.
-
-Specific information for the application $app.
-
-$(if [ -n "$app_message" ]
-then
-	cat "$app_message"
-else
-	echo "...No specific information..."
-fi)
-
----
-Automatic diagnosis data from YunoHost
-
-__PRE_TAG1__$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')__PRE_TAG2__"
-
-	# Store the message into a file for further modifications.
-	echo "$mail_message" > mail_to_send
-
-	# If a html email is required. Apply html tags to the message.
- 	if [ "$admin_mail_html" -eq 1 ]
- 	then
-		# Insert 'br' tags at each ending of lines.
-		ynh_replace_string "$" "
" mail_to_send
-
-		# Insert starting HTML tags
-		sed --in-place '1s@^@\n\n\n\n@' mail_to_send
-
-		# Keep tabulations
-		ynh_replace_string "  " "\ \ " mail_to_send
-		ynh_replace_string "\t" "\ \ " mail_to_send
-
-		# Insert url links tags
-		ynh_replace_string "__URL_TAG1__\(.*\)__URL_TAG2__\(.*\)__URL_TAG3__" "\1" mail_to_send
-
-		# Insert pre tags
-		ynh_replace_string "__PRE_TAG1__" "
" mail_to_send
-		ynh_replace_string "__PRE_TAG2__" "<\pre>" mail_to_send
-
-		# Insert finishing HTML tags
-		echo -e "\n\n" >> mail_to_send
-
-	# Otherwise, remove tags to keep a plain text.
-	else
-		# Remove URL tags
-		ynh_replace_string "__URL_TAG[1,3]__" "" mail_to_send
-		ynh_replace_string "__URL_TAG2__" ": " mail_to_send
-
-		# Remove PRE tags
-		ynh_replace_string "__PRE_TAG[1-2]__" "" mail_to_send
-	fi
-
-	# Define binary to use for mail command
-	if [ -e /usr/bin/bsd-mailx ]
-	then
-		local mail_bin=/usr/bin/bsd-mailx
-	else
-		local mail_bin=/usr/bin/mail.mailutils
-	fi
-
-	if [ "$admin_mail_html" -eq 1 ]
-	then
-		content_type="text/html"
-	else
-		content_type="text/plain"
-	fi
-
-	# Send the email to the recipients
-	cat mail_to_send | $mail_bin -a "Content-Type: $content_type; charset=UTF-8" -s "$mail_subject" "$recipients"
-}

From 95a23c4b1e426927ca25a18f602cd0719566f4f9 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 19 Apr 2020 20:51:18 +0200
Subject: [PATCH 19/31] cleanup upgrade

---
 scripts/upgrade | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 6f9aad7..98ae7e6 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -166,7 +166,7 @@ ynh_add_fpm_config --phpversion="7.3"
 ynh_print_info --message="Configuring Kimai2..."
 
 local_conf="$final_path/config/packages/local.yaml"
-ynh_backup_if_checksum_is_different "$local_conf"
+ynh_backup_if_checksum_is_different --file="$local_conf"
 sudo cp ../conf/local.yaml $local_conf
 ynh_replace_string  --match_string="__APP__" "$app" --target_file="$local_conf"
 if [ $registration -eq 1  ]
@@ -175,18 +175,17 @@ then
 else
 	ynh_replace_string  --match_string="__REGISTRATION__" --replace_string="false" --target_file="$local_conf"
 fi
-ynh_store_file_checksum "$local_conf"
+ynh_store_file_checksum --file="$local_conf"
 
 env_conf=$final_path/.env
-ynh_backup_if_checksum_is_different "$env_conf"
+ynh_backup_if_checksum_is_different --file="$env_conf"
 # Configure environement
 if [ "$database" = "mysql" ]; then
 	# setup application config
 	sudo  cp ../conf/.env.mysql $env_conf
 	db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 	db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-	db_user=$db_name
-	
+	db_user=$db_name	
 	ynh_replace_string --match_string="__RANDOM_KEY__" --replace_string="$random_key" --target_file="$env_conf"
 	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$env_conf"
 	ynh_replace_string --match_string="__DB_PASSWORD__" --replace_string="$db_pwd" --target_file="$env_conf"
@@ -198,7 +197,7 @@ else
 	ynh_replace_string --match_string="__RANDOM_KEY__" --replace_string="$random_key" --target_file="$env_conf"
 	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$env_conf"
 fi
-ynh_store_file_checksum "$env_conf"
+ynh_store_file_checksum --file="$env_conf"
 
 #=================================================
 # UPGRADE KIMAI2
@@ -209,7 +208,7 @@ ynh_install_composer --phpversion="7.3" --workdir="$final_path" --install_args="
 ynh_composer_exec --phpversion="7.3" --workdir="$final_path" --commands="require laminas/laminas-ldap"
 
 pushd "$final_path"
-	php7.3 bin/console kimai:update
+	php7.3 bin/console kimai:update -n
 popd
 
 #=================================================

From ea760668dfc81d906f4307c35ee9072e50030cf5 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Tue, 21 Apr 2020 00:37:30 +0200
Subject: [PATCH 20/31] Fix install

/usr/share/yunohost/helpers.d/string: line 50: replace_string: unbound variable
---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 7104748..c894560 100755
--- a/scripts/install
+++ b/scripts/install
@@ -118,7 +118,7 @@ ynh_print_info --message="Configuring Kimai2..."
 local_conf="$final_path/config/packages/local.yaml"
 # Configure registration
 sudo cp ../conf/local.yaml $local_conf
-ynh_replace_string  --match_string="__APP__" "$app" --target_file="$local_conf"
+ynh_replace_string  --match_string="__APP__" --replace_string="$app" --target_file="$local_conf"
 if [ $registration -eq 1  ]
 then
 	ynh_replace_string  --match_string="__REGISTRATION__" --replace_string="true" --target_file="$local_conf"

From 71d558781ec884fc3e132aca2ee13ebd0c2278a2 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Tue, 21 Apr 2020 12:29:01 +0200
Subject: [PATCH 21/31] Fix upgrade

/usr/share/yunohost/helpers.d/string: line 50: replace_string: unbound variable
---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 98ae7e6..ffd7bea 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -168,7 +168,7 @@ ynh_print_info --message="Configuring Kimai2..."
 local_conf="$final_path/config/packages/local.yaml"
 ynh_backup_if_checksum_is_different --file="$local_conf"
 sudo cp ../conf/local.yaml $local_conf
-ynh_replace_string  --match_string="__APP__" "$app" --target_file="$local_conf"
+ynh_replace_string  --match_string="__APP__" --replace_string="$app" --target_file="$local_conf"
 if [ $registration -eq 1  ]
 then
 	ynh_replace_string  --match_string="__REGISTRATION__" --replace_string="true" --target_file="$local_conf"

From 6827caedc2dadf62d29d9f822470824aff491eb3 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Wed, 22 Apr 2020 05:22:55 +0200
Subject: [PATCH 22/31] forgotten variable

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

diff --git a/scripts/upgrade b/scripts/upgrade
index ffd7bea..90107e0 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -24,6 +24,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+registration=$(ynh_app_setting_get --app=$app --key=registration)
 database=$(ynh_app_setting_get --app=$app --key=database)
 random_key=$(ynh_app_setting_get --app=$app --key=random_key)
 

From 6e59c7a23cfd6315123a438366ee040035ae2c23 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Wed, 22 Apr 2020 16:23:18 +0200
Subject: [PATCH 23/31] Fix permission creation during upgrade

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 90107e0..bd4c7aa 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -227,9 +227,20 @@ chown -R $app: $final_path
 #=================================================
 ynh_print_info --message="Upgrading SSOwat configuration..."
 
-ynh_permission_create --permission="teamlead"
-ynh_permission_create --permission="admin"
-ynh_permission_create --permission="super_admin" --allowed "$admin"
+if ! ynh_permission_exists --permission="teamlead"
+then
+	ynh_permission_create --permission="teamlead"
+fi
+
+if ! ynh_permission_exists --permission="admin"
+then
+	ynh_permission_create --permission="admin"
+fi
+
+if ! ynh_permission_exists --permission="super_admin"
+then
+	ynh_permission_create --permission="super_admin" --allowed "$admin"
+fi
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]

From 15a34edb9d81274038cd8d30197171516fe31211 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 25 Apr 2020 22:22:17 +0200
Subject: [PATCH 24/31] Fix Manifest

! [YEP-2.1] You should specify the type of the argument 'database'. You can use : domain, path, boolean, app, password, user, string, display_text.
---
 manifest.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifest.json b/manifest.json
index c593b13..cae7fce 100644
--- a/manifest.json
+++ b/manifest.json
@@ -62,6 +62,7 @@
             },
             {
                 "name": "database",
+                "type": "string",
                 "ask": {
                     "en": "Choose the database to use (for production usage choose: mysql)",
                     "fr": "Choisissez le type de base de données à utiliser (mysql pour un usage en production)",

From 9511b6070f76a548007810e3c4259a063e75d870 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 25 Apr 2020 22:23:15 +0200
Subject: [PATCH 25/31] Update manifest.json

! Using official helper ynh_permission_create implies requiring at least version 3.7.0, but manifest only requires >= 3.5
---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index cae7fce..ee19a57 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,7 +17,7 @@
         "url": "datamol.org"
     },
     "requirements": {
-        "yunohost": ">= 3.5"
+        "yunohost": ">= 3.7"
     },
     "multi_instance": true,
     "services": [

From 86722409f6c1387469cc5a5d0c282dcc4a7dc7f2 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sat, 25 Apr 2020 22:24:46 +0200
Subject: [PATCH 26/31] removing sudo

! [YEP-2.12] You should not need to use 'sudo', the script is being run as root. (If you need to run a command using a specific user, use 'ynh_exec_as')
---
 scripts/install | 6 +++---
 scripts/upgrade | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/install b/scripts/install
index c894560..01d4be5 100755
--- a/scripts/install
+++ b/scripts/install
@@ -117,7 +117,7 @@ ynh_print_info --message="Configuring Kimai2..."
 
 local_conf="$final_path/config/packages/local.yaml"
 # Configure registration
-sudo cp ../conf/local.yaml $local_conf
+cp ../conf/local.yaml $local_conf
 ynh_replace_string  --match_string="__APP__" --replace_string="$app" --target_file="$local_conf"
 if [ $registration -eq 1  ]
 then
@@ -130,7 +130,7 @@ env_conf="$final_path/.env"
 # Configure environement
 if [ "$database" = "mysql" ]; then
 	# setup application config
-	sudo  cp ../conf/.env.mysql $env_conf
+	cp ../conf/.env.mysql $env_conf
 	db_name=$(ynh_sanitize_dbid --db_name=$app)
 	db_user=$db_name
 	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
@@ -142,7 +142,7 @@ if [ "$database" = "mysql" ]; then
 	ynh_replace_string  --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$env_conf"
 else
 	# setup application config
-	sudo  cp ../conf/.env.sqlite $env_conf
+	cp ../conf/.env.sqlite $env_conf
 	ynh_replace_string  --match_string="__RANDOM_KEY__" --replace_string="$random_key" --target_file="$env_conf"
 	ynh_replace_string  --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$env_conf"
 fi
diff --git a/scripts/upgrade b/scripts/upgrade
index bd4c7aa..63f1586 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -168,7 +168,7 @@ ynh_print_info --message="Configuring Kimai2..."
 
 local_conf="$final_path/config/packages/local.yaml"
 ynh_backup_if_checksum_is_different --file="$local_conf"
-sudo cp ../conf/local.yaml $local_conf
+cp ../conf/local.yaml $local_conf
 ynh_replace_string  --match_string="__APP__" --replace_string="$app" --target_file="$local_conf"
 if [ $registration -eq 1  ]
 then
@@ -183,7 +183,7 @@ ynh_backup_if_checksum_is_different --file="$env_conf"
 # Configure environement
 if [ "$database" = "mysql" ]; then
 	# setup application config
-	sudo  cp ../conf/.env.mysql $env_conf
+	cp ../conf/.env.mysql $env_conf
 	db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 	db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 	db_user=$db_name	
@@ -194,7 +194,7 @@ if [ "$database" = "mysql" ]; then
 	ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$env_conf"
 else
 	# setup application config
-	sudo  cp ../conf/.env.sqlite $env_conf
+	cp ../conf/.env.sqlite $env_conf
 	ynh_replace_string --match_string="__RANDOM_KEY__" --replace_string="$random_key" --target_file="$env_conf"
 	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$env_conf"
 fi

From 429459400059ad20ee33a0fcd52372b64a36dc09 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Fri, 1 May 2020 10:35:54 +0200
Subject: [PATCH 27/31] Upgrade to 1.9

---
 README.md     | 2 +-
 conf/app.src  | 4 ++--
 manifest.json | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6b234bc..2347ac9 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This is the reloaded version of the open source timetracker Kimai. Right now its
 Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE).
 https://github.com/kevinpapst/kimai2
 
-Shipped Version: **1.8**
+Shipped Version: **1.9**
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index 3e65fcd..c4d23c2 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/1.8.tar.gz
-SOURCE_SUM=b5133d4dc98a360042fdbd9ac054b72ad9db3ce274ee733981375610ab7f46ef
+SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/1.9.tar.gz
+SOURCE_SUM=1c9aa7837969f177bf5712c85b83cc4742bce9f53bd066e5fa7c7bf54d718d23
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index ee19a57..ae3c490 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
         "de": "Eine web-basierte Mehrbenutzer-Zeiterfassung mit Rechnungsdruck mit Unterstützung für mobile Endgeräte",
         "cs": "Víceuživatelská webová aplikace pro sledování času s podporou mobilních zařízení"
     },
-    "version": "1.8~ynh1",
+    "version": "1.9~ynh1",
     "url": "https://v2.kimai.org",
     "license": "MIT",
     "maintainer": {

From e34eab6e0c32ecc2053ffd6acbdc5d25a3d2c674 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 24 May 2020 01:15:54 +0200
Subject: [PATCH 28/31] Fix messages

---
 scripts/install | 1 -
 scripts/restore | 1 -
 2 files changed, 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 01d4be5..45ee6fe 100755
--- a/scripts/install
+++ b/scripts/install
@@ -67,7 +67,6 @@ ynh_app_setting_set --app=$app --key=random_key --value=$random_key
 #=================================================
 # INSTALL PHP7.3
 #=================================================
-ynh_print_info --message="Installing PHP7.3..."
 
 if [ "$(lsb_release --codename --short)" = "buster" ]; then
 	pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
diff --git a/scripts/restore b/scripts/restore
index 3701844..77406ab 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -82,7 +82,6 @@ chown -R $app: $final_path
 #=================================================
 # REINSTALL PHP7.3
 #=================================================
-ynh_print_info --message="Reinstall PHP7.3..."
 
 if [ "$(lsb_release --codename --short)" = "buster" ]; then
 	pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"

From e5ce0d869526c6c856c1e2398b4b2ce0ba8e7542 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 24 May 2020 02:19:37 +0200
Subject: [PATCH 29/31] make it YunoHost 3.8 ready

---
 conf/nginx.conf                    |   2 +-
 conf/php-fpm.conf                  |   4 +-
 manifest.json                      |   2 +-
 scripts/_common.sh                 |   4 +-
 scripts/backup                     |   2 +-
 scripts/install                    |  35 ++--
 scripts/remove                     |  11 +-
 scripts/restore                    |  33 ++--
 scripts/upgrade                    |  28 +--
 scripts/ynh_add_extra_apt_repos__3 | 294 -----------------------------
 scripts/ynh_install_php__3         |  78 --------
 11 files changed, 39 insertions(+), 454 deletions(-)
 delete mode 100644 scripts/ynh_add_extra_apt_repos__3
 delete mode 100644 scripts/ynh_install_php__3

diff --git a/conf/nginx.conf b/conf/nginx.conf
index d698030..314a98c 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -19,7 +19,7 @@ location __PATH__/ {
   try_files $uri $uri/ /index.php$is_args$args;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    fastcgi_pass unix:/var/run/php/php7.3-fpm-__NAME__.sock;
+    fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
 
     fastcgi_index index.php;
     include fastcgi_params;
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index db3ac1d..579b281 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -33,7 +33,7 @@ group = __USER__
 ;                            (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/php7.3-fpm-__NAMETOCHANGE__.sock
+listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock
 
 ; Set listen(2) backlog.
 ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
@@ -229,7 +229,7 @@ pm.max_requests = 500
 ;   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.3/fpm/status.html
+;       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
diff --git a/manifest.json b/manifest.json
index ae3c490..32e46bc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,7 +17,7 @@
         "url": "datamol.org"
     },
     "requirements": {
-        "yunohost": ">= 3.7"
+        "yunohost": ">= 3.8"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index e40ce05..b657133 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,7 +7,9 @@
 # dependencies used by the app
 pkg_dependencies=""
 
-extra_pkg_dependencies="php7.3-gd php7.3-intl php7.3-json php7.3-mbstring php7.3-pdo php7.3-zip php7.3-xml php7.3-xsl php7.3-ldap php7.3-mysql php7.3-sqlite3"
+YNH_PHP_VERSION="7.3"
+
+extra_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"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/backup b/scripts/backup
index 203a532..7efdae6 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -53,7 +53,7 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 ynh_print_info --message="Backing up php-fpm configuration..."
 
-ynh_backup --src_path="/etc/php/7.3/fpm/pool.d/$app.conf"
+ynh_backup --src_path="/etc/php/${YNH_PHP_VERSION}/fpm/pool.d/$app.conf"
 
 #=================================================
 # BACKUP THE MYSQL DATABASE
diff --git a/scripts/install b/scripts/install
index 45ee6fe..de31c61 100755
--- a/scripts/install
+++ b/scripts/install
@@ -7,8 +7,6 @@
 #=================================================
 
 source _common.sh
-source ynh_add_extra_apt_repos__3
-source ynh_install_php__3
 source ynh_composer__2
 source /usr/share/yunohost/helpers
 
@@ -64,17 +62,6 @@ ynh_app_setting_set --app=$app --key=random_key --value=$random_key
 
 #=================================================
 # STANDARD MODIFICATIONS
-#=================================================
-# INSTALL PHP7.3
-#=================================================
-
-if [ "$(lsb_release --codename --short)" = "buster" ]; then
-	pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
-else
-	ynh_print_info --message="Installing PHP7.3..."
-	ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies"
-fi
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
@@ -107,6 +94,14 @@ ynh_print_info --message="Configuring system user..."
 # Create a system user
 ynh_system_user_create --username=$app
 
+#=================================================
+# PHP-FPM CONFIGURATION
+#=================================================
+ynh_print_info --message="Configuring php-fpm..."
+
+# Create a dedicated php-fpm config
+ynh_add_fpm_config --package="extra_php_dependencies"
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
@@ -151,11 +146,11 @@ fi
 #=================================================
 ynh_print_info --message="Building Kimai2..."
 
-ynh_install_composer --phpversion="7.3" --workdir="$final_path" --install_args="--optimize-autoloader"
-ynh_composer_exec --phpversion="7.3" --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"
 
 pushd "$final_path"
-	php7.3 bin/console kimai:install -n
+	php${YNH_PHP_VERSION} bin/console kimai:install -n
 popd
 
 #=================================================
@@ -169,14 +164,6 @@ ynh_store_file_checksum --file="$env_conf"
 
 #=================================================
 # GENERIC FINALIZATION
-#=================================================
-# PHP-FPM CONFIGURATION
-#=================================================
-ynh_print_info --message="Configuring php-fpm..."
-
-# Create a dedicated php-fpm config
-ynh_add_fpm_config --phpversion="7.3"
-
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index fb9f6ae..3213b8f 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -7,8 +7,6 @@
 #=================================================
 
 source _common.sh
-source ynh_add_extra_apt_repos__3
-source ynh_install_php__3
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -37,13 +35,12 @@ if [ "$database" = "mysql" ]; then
 fi
 
 #=================================================
-# REMOVE PHP7.3
+# REMOVE DEPENDENCIES
 #=================================================
+ynh_print_info --message="Removing dependencies..."
 
-if [ "$(lsb_release --codename --short)" != "buster" ]; then
-	ynh_print_info --message="Removing php..."
-	ynh_remove_php
-fi
+# Remove metapackage and its dependencies
+ynh_remove_app_dependencies
 
 #=================================================
 # REMOVE APP MAIN DIR
diff --git a/scripts/restore b/scripts/restore
index 77406ab..9c83a0d 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -8,8 +8,6 @@
 
 #Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
-source ../settings/scripts/ynh_add_extra_apt_repos__3
-source ../settings/scripts/ynh_install_php__3
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -77,19 +75,19 @@ ynh_print_info --message="Restoring user rights..."
 # Restore permissions on app files
 chown -R $app: $final_path
 
+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+ynh_print_info --message="Restoring PHP-FPM configuration..."
+
+# Restore the file first, so it can have a backup if different
+ynh_restore_file --origin_path="/etc/php/${YNH_PHP_VERSION}/fpm/pool.d/$app.conf"
+
+# Recreate a dedicated php-fpm config
+ynh_add_fpm_config --package="extra_php_dependencies"
+
 #=================================================
 # SPECIFIC RESTORATION
-#=================================================
-# REINSTALL PHP7.3
-#=================================================
-
-if [ "$(lsb_release --codename --short)" = "buster" ]; then
-	pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
-else
-	ynh_print_info --message="Reinstalling PHP7.3..."
-	ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies"
-fi
-
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
@@ -111,13 +109,6 @@ if [ "$database" = "mysql" ]; then
 	ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 fi
 
-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_print_info --message="Restoring PHP-FPM configuration..."
-
-ynh_restore_file --origin_path="/etc/php/7.3/fpm/pool.d/$app.conf"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
@@ -125,7 +116,7 @@ ynh_restore_file --origin_path="/etc/php/7.3/fpm/pool.d/$app.conf"
 #=================================================
 ynh_print_info --message="Reloading nginx web server and php-fpm..."
 
-ynh_systemd_action --service_name=php7.3-fpm --action=reload
+ynh_systemd_action --service_name=php${YNH_PHP_VERSION}-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 63f1586..b92a0a3 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -7,8 +7,6 @@
 #=================================================
 
 source _common.sh
-source ynh_add_extra_apt_repos__3
-source ynh_install_php__3
 source ynh_composer__2
 source /usr/share/yunohost/helpers
 
@@ -71,24 +69,6 @@ ynh_abort_if_errors
 
 #=================================================
 # STANDARD UPGRADE STEPS
-#=================================================
-# UPGRADE PHP7.3
-#=================================================
-
-if [ "$(lsb_release --codename --short)" = "buster" ]; then
-	pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
-else
-	if [ "$(ynh_app_setting_get --app=$app --key=php_version)" != "7.3" ]; then
-		ynh_print_info --message="Upgrading PHP7.3..."
-		ynh_remove_fpm_config
-		ynh_remove_app_dependencies
-		ynh_remove_php
-		ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies"
-	else
-		ynh_install_php --phpversion="7.3" --package="$extra_pkg_dependencies"
-	fi
-fi
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -157,7 +137,7 @@ ynh_system_user_create --username=$app
 ynh_print_info --message="Upgrading php-fpm configuration..."
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --phpversion="7.3"
+ynh_add_fpm_config --package="extra_php_dependencies"
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -205,11 +185,11 @@ ynh_store_file_checksum --file="$env_conf"
 #=================================================
 ynh_print_info --message="Upgrading Kimai2..."
 
-ynh_install_composer --phpversion="7.3" --workdir="$final_path" --install_args="--optimize-autoloader"
-ynh_composer_exec --phpversion="7.3" --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"
 
 pushd "$final_path"
-	php7.3 bin/console kimai:update -n
+	php${YNH_PHP_VERSION} bin/console kimai:update -n
 popd
 
 #=================================================
diff --git a/scripts/ynh_add_extra_apt_repos__3 b/scripts/ynh_add_extra_apt_repos__3
deleted file mode 100644
index 3276f00..0000000
--- a/scripts/ynh_add_extra_apt_repos__3
+++ /dev/null
@@ -1,294 +0,0 @@
-#!/bin/bash
-
-# Pin a repository.
-#
-# usage: ynh_pin_repo --package=packages --pin=pin_filter [--priority=priority_value] [--name=name] [--append]
-# | arg: -p, --package - Packages concerned by the pin. Or all, *.
-# | arg: -i, --pin - Filter for the pin.
-# | arg: -p, --priority - Priority for the pin
-# | arg: -n, --name - Name for the files for this repo, $app as default value.
-# | arg: -a, --append - Do not overwrite existing files.
-#
-# See https://manpages.debian.org/stretch/apt/apt_preferences.5.en.html for information about pinning.
-#
-ynh_pin_repo () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=pirna
-	declare -Ar args_array=( [p]=package= [i]=pin= [r]=priority= [n]=name= [a]=append )
-	local package
-	local pin
-	local priority
-	local name
-	local append
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	package="${package:-*}"
-	priority=${priority:-50}
-	name="${name:-$app}"
-	append=${append:-0}
-
-	if [ $append -eq 1 ]
-	then
-		append="tee -a"
-	else
-		append="tee"
-	fi
-
-	mkdir -p "/etc/apt/preferences.d"
-	echo "Package: $package
-Pin: $pin
-Pin-Priority: $priority" \
-	| $append "/etc/apt/preferences.d/$name"
-}
-
-# Add a repository.
-#
-# usage: ynh_add_repo --uri=uri --suite=suite --component=component [--name=name] [--append]
-# | arg: -u, --uri - Uri of the repository.
-# | arg: -s, --suite - Suite of the repository.
-# | arg: -c, --component - Component of the repository.
-# | arg: -n, --name - Name for the files for this repo, $app as default value.
-# | arg: -a, --append - Do not overwrite existing files.
-#
-# Example for a repo like deb http://forge.yunohost.org/debian/ stretch stable
-#                             uri                               suite   component
-# ynh_add_repo --uri=http://forge.yunohost.org/debian/ --suite=stretch --component=stable
-#
-ynh_add_repo () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=uscna
-	declare -Ar args_array=( [u]=uri= [s]=suite= [c]=component= [n]=name= [a]=append )
-	local uri
-	local suite
-	local component
-	local name
-	local append
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	name="${name:-$app}"
-	append=${append:-0}
-
-	if [ $append -eq 1 ]
-	then
-		append="tee -a"
-	else
-		append="tee"
-	fi
-
-	mkdir -p "/etc/apt/sources.list.d"
-	# Add the new repo in sources.list.d
-	echo "deb $uri $suite $component" \
-		| $append "/etc/apt/sources.list.d/$name.list"
-}
-
-# Add an extra repository correctly, pin it and get the key.
-#
-# usage: ynh_install_extra_repo --repo="repo" [--key=key_url] [--priority=priority_value] [--name=name] [--append]
-# | arg: -r, --repo - Complete url of the extra repository.
-# | arg: -k, --key - url to get the public key.
-# | arg: -p, --priority - Priority for the pin
-# | arg: -n, --name - Name for the files for this repo, $app as default value.
-# | arg: -a, --append - Do not overwrite existing files.
-ynh_install_extra_repo () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=rkpna
-	declare -Ar args_array=( [r]=repo= [k]=key= [p]=priority= [n]=name= [a]=append )
-	local repo
-	local key
-	local priority
-	local name
-	local append
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	name="${name:-$app}"
-	append=${append:-0}
-	key=${key:-0}
-	priority=${priority:-}
-
-	if [ $append -eq 1 ]
-	then
-		append="--append"
-		wget_append="tee -a"
-	else
-		append=""
-		wget_append="tee"
-	fi
-
-	# Split the repository into uri, suite and components.
-	# Remove "deb " at the beginning of the repo.
-	repo="${repo#deb }"
-
-	# Get the uri
-	local uri="$(echo "$repo" | awk '{ print $1 }')"
-
-	# Get the suite
-	local suite="$(echo "$repo" | awk '{ print $2 }')"
-
-	# Get the components
-	local component="${repo##$uri $suite }"
-
-	# Add the repository into sources.list.d
-	ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" $append
-
-	# Pin the new repo with the default priority, so it won't be used for upgrades.
-	# Build $pin from the uri without http and any sub path
-	local pin="${uri#*://}"
-	pin="${pin%%/*}"
-	# Set a priority only if asked
-	if [ -n "$priority" ]
-	then
-		priority="--priority=$priority"
-	fi
-	ynh_pin_repo --package="*" --pin="origin \"$pin\"" $priority --name="$name" $append
-
-	# Get the public key for the repo
-	if [ -n "$key" ]
-	then
-		mkdir -p "/etc/apt/trusted.gpg.d"
-		wget -q "$key" -O - | gpg --dearmor | $wget_append /etc/apt/trusted.gpg.d/$name.gpg > /dev/null
-	fi
-
-	# Update the list of package with the new repo
-	ynh_package_update
-}
-
-# Remove an extra repository and the assiociated configuration.
-#
-# usage: ynh_remove_extra_repo [--name=name]
-# | arg: -n, --name - Name for the files for this repo, $app as default value.
-ynh_remove_extra_repo () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=n
-	declare -Ar args_array=( [n]=name= )
-	local name
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	name="${name:-$app}"
-
-	ynh_secure_remove "/etc/apt/sources.list.d/$name.list"
-	ynh_secure_remove "/etc/apt/preferences.d/$name"
-	ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.gpg"
-	ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.asc"
-
-	# Update the list of package to exclude the old repo
-	ynh_package_update
-}
-
-# Install packages from an extra repository properly.
-#
-# usage: ynh_install_extra_app_dependencies --repo="repo" --package="dep1 dep2" [--key=key_url] [--name=name]
-# | arg: -r, --repo - Complete url of the extra repository.
-# | arg: -p, --package - The packages to install from this extra repository
-# | arg: -k, --key - url to get the public key.
-# | arg: -n, --name - Name for the files for this repo, $app as default value.
-ynh_install_extra_app_dependencies () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=rpkn
-	declare -Ar args_array=( [r]=repo= [p]=package= [k]=key= [n]=name= )
-	local repo
-	local package
-	local key
-	local name
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	name="${name:-$app}"
-	key=${key:-0}
-
-	# Set a key only if asked
-	if [ -n "$key" ]
-	then
-		key="--key=$key"
-	fi
-	# Add an extra repository for those packages
-	ynh_install_extra_repo --repo="$repo" $key --priority=995 --name=$name
-
-	# Install requested dependencies from this extra repository.
-	ynh_add_app_dependencies --package="$package"
-
-	# Remove this extra repository after packages are installed
-	ynh_remove_extra_repo --name=$app
-}
-
-#=================================================
-
-# patched version of ynh_install_app_dependencies to be used with ynh_add_app_dependencies
-
-# Define and install dependencies with a equivs control file
-# This helper can/should only be called once per app
-#
-# usage: ynh_install_app_dependencies dep [dep [...]]
-# | arg: dep - the package name to install in dependence
-#   You can give a choice between some package with this syntax : "dep1|dep2"
-#   Example : ynh_install_app_dependencies dep1 dep2 "dep3|dep4|dep5"
-#   This mean in the dependence tree : dep1 & dep2 & (dep3 | dep4 | dep5)
-#
-# Requires YunoHost version 2.6.4 or higher.
-ynh_install_app_dependencies () {
-    local dependencies=$@
-    dependencies="$(echo "$dependencies" | sed 's/\([^\<=\>]\)\ \([^(]\)/\1, \2/g')"
-    dependencies=${dependencies//|/ | }
-    local manifest_path="../manifest.json"
-    if [ ! -e "$manifest_path" ]; then
-    	manifest_path="../settings/manifest.json"	# Into the restore script, the manifest is not at the same place
-    fi
-
-    local version=$(grep '\"version\": ' "$manifest_path" | cut -d '"' -f 4)	# Retrieve the version number in the manifest file.
-    if [ ${#version} -eq 0 ]; then
-        version="1.0"
-    fi
-    local dep_app=${app//_/-}	# Replace all '_' by '-'
-
-    # Handle specific versions
-    if [[ "$dependencies" =~ [\<=\>] ]]
-    then
-        # Replace version specifications by relationships syntax
-        # https://www.debian.org/doc/debian-policy/ch-relationships.html
-        # Sed clarification
-        # [^(\<=\>] ignore if it begins by ( or < = >. To not apply twice.
-        # [\<=\>] matches < = or >
-        # \+ matches one or more occurence of the previous characters, for >= or >>.
-        # [^,]\+ matches all characters except ','
-        # Ex: package>=1.0 will be replaced by package (>= 1.0)
-        dependencies="$(echo "$dependencies" | sed 's/\([^(\<=\>]\)\([\<=\>]\+\)\([^,]\+\)/\1 (\2 \3)/g')"
-    fi
-
-    cat > /tmp/${dep_app}-ynh-deps.control << EOF	# Make a control file for equivs-build
-Section: misc
-Priority: optional
-Package: ${dep_app}-ynh-deps
-Version: ${version}
-Depends: ${dependencies}
-Architecture: all
-Description: Fake package for $app (YunoHost app) dependencies
- This meta-package is only responsible of installing its dependencies.
-EOF
-    ynh_package_install_from_equivs /tmp/${dep_app}-ynh-deps.control \
-        || ynh_die --message="Unable to install dependencies"	# Install the fake package and its dependencies
-    rm /tmp/${dep_app}-ynh-deps.control
-    ynh_app_setting_set --app=$app --key=apt_dependencies --value="$dependencies"
-}
-
-ynh_add_app_dependencies () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=pr
-	declare -Ar args_array=( [p]=package= [r]=replace)
-	local package
-	local replace
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	replace=${replace:-0}
-
-	local current_dependencies=""
-	if [ $replace -eq 0 ]
-	then
-		local dep_app=${app//_/-}	# Replace all '_' by '-'
-		if ynh_package_is_installed --package="${dep_app}-ynh-deps"
-		then
-			current_dependencies="$(dpkg-query --show --showformat='${Depends}' ${dep_app}-ynh-deps) "
-		fi
-
-		current_dependencies=${current_dependencies// | /|}
-	fi
-
-	ynh_install_app_dependencies "${current_dependencies}${package}"
-}
diff --git a/scripts/ynh_install_php__3 b/scripts/ynh_install_php__3
deleted file mode 100644
index 8d8323a..0000000
--- a/scripts/ynh_install_php__3
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-# Install another version of php.
-#
-# usage: ynh_install_php --phpversion=phpversion [--package=packages]
-# | arg: -v, --phpversion - Version of php to install. Can be one of 7.1, 7.2 or 7.3
-# | arg: -p, --package - Additionnal php packages to install
-ynh_install_php () {
-	# Declare an array to define the options of this helper.
-	local legacy_args=vp
-	declare -Ar args_array=( [v]=phpversion= [p]=package= )
-	local phpversion
-	local package
-	# Manage arguments with getopts
-	ynh_handle_getopts_args "$@"
-	package=${package:-}
-
-	# Store php_version into the config of this app
-	ynh_app_setting_set $app php_version $phpversion
-
-	if [ "$phpversion" == "7.0" ]
-	then
-		ynh_die "Do not use ynh_install_php to install php7.0"
-	fi
-
-	# Store the ID of this app and the version of php requested for it
-	echo "$YNH_APP_INSTANCE_NAME:$phpversion" | tee --append "/etc/php/ynh_app_version"
-
-	# Add an extra repository for those packages
-	ynh_install_extra_repo --repo="https://packages.sury.org/php/ $(lsb_release -sc) main" --key="https://packages.sury.org/php/apt.gpg" --priority=995 --name=extra_php_version
-
-	# Install requested dependencies from this extra repository.
-	# Install php-fpm first, otherwise php will install apache as a dependency.
-	ynh_add_app_dependencies --package="php${phpversion}-fpm"
-	ynh_add_app_dependencies --package="php$phpversion php${phpversion}-common $package"
-
-	# Set php7.0 back as the default version for php-cli.
-	update-alternatives --set php /usr/bin/php7.0
-
-	# Pin this extra repository after packages are installed to prevent sury of doing shit
-	ynh_pin_repo --package="*" --pin="origin \"packages.sury.org\"" 200 --name=extra_php_version
-	ynh_pin_repo --package="php7.0*" --pin="origin \"packages.sury.org\"" 600 --name=extra_php_version --append
-
-	# INTEGRATE SERVICE IN YUNOHOST
-	yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log"
-}
-
-ynh_remove_php () {
-	# Get the version of php used by this app
-	local phpversion=$(ynh_app_setting_get $app php_version)
-
-	if [ "$phpversion" == "7.0" ] || [ -z "$phpversion" ]
-	then
-		if [ "$phpversion" == "7.0" ]
-		then
-			ynh_print_err "Do not use ynh_remove_php to install php7.0"
-		fi
-		return 0
-	fi
-
-	# Remove the line for this app
-	sed --in-place "/$YNH_APP_INSTANCE_NAME:$phpversion/d" "/etc/php/ynh_app_version"
-
-	# If no other app uses this version of php, remove it.
-	if ! grep --quiet "$phpversion" "/etc/php/ynh_app_version"
-	then
-		# Purge php dependences for this version.
-		ynh_package_autopurge "php$phpversion php${phpversion}-fpm php${phpversion}-common"
-		# Remove the service from the admin panel
-		yunohost service remove php${phpversion}-fpm
-	fi
-
-	# If no other app uses alternate php versions, remove the extra repo for php
-	if [ ! -s "/etc/php/ynh_app_version" ]
-	then
-		ynh_secure_remove /etc/php/ynh_app_version
-	fi
-}

From 61523edfddcd30c561ed85e2cedf72cbdbdfe362 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Sun, 24 May 2020 02:35:13 +0200
Subject: [PATCH 30/31] typo

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

diff --git a/scripts/install b/scripts/install
index de31c61..986aadd 100755
--- a/scripts/install
+++ b/scripts/install
@@ -100,7 +100,7 @@ ynh_system_user_create --username=$app
 ynh_print_info --message="Configuring php-fpm..."
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --package="extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC SETUP
diff --git a/scripts/restore b/scripts/restore
index 9c83a0d..399cbdd 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -84,7 +84,7 @@ ynh_print_info --message="Restoring PHP-FPM configuration..."
 ynh_restore_file --origin_path="/etc/php/${YNH_PHP_VERSION}/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated php-fpm config
-ynh_add_fpm_config --package="extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index b92a0a3..c9fbb9c 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -137,7 +137,7 @@ ynh_system_user_create --username=$app
 ynh_print_info --message="Upgrading php-fpm configuration..."
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --package="extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC UPGRADE

From 93968e7326d7aa1d6361437ed061a5b4a0ce9829 Mon Sep 17 00:00:00 2001
From: yalh76 
Date: Tue, 26 May 2020 01:14:51 +0200
Subject: [PATCH 31/31] Fix restore

cp: cannot stat '../conf/php-fpm.conf': No such file or directory
---
 conf/php-fpm.conf | 430 ----------------------------------------------
 scripts/install   |   2 +-
 scripts/restore   |   2 +-
 scripts/upgrade   |   2 +-
 4 files changed, 3 insertions(+), 433 deletions(-)
 delete mode 100644 conf/php-fpm.conf

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
deleted file mode 100644
index 579b281..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 = 10
-
-; 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 %{}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 %{}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 = /var/log/nginx/__NAMETOCHANGE__.slow.log
- 
-; 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 = 5s
- 
-; 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__/public
-
-; 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/scripts/install b/scripts/install
index 986aadd..6e222e9 100755
--- a/scripts/install
+++ b/scripts/install
@@ -100,7 +100,7 @@ ynh_system_user_create --username=$app
 ynh_print_info --message="Configuring php-fpm..."
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC SETUP
diff --git a/scripts/restore b/scripts/restore
index 399cbdd..d4f627d 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -84,7 +84,7 @@ ynh_print_info --message="Restoring PHP-FPM configuration..."
 ynh_restore_file --origin_path="/etc/php/${YNH_PHP_VERSION}/fpm/pool.d/$app.conf"
 
 # Recreate a dedicated php-fpm config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC RESTORATION
diff --git a/scripts/upgrade b/scripts/upgrade
index c9fbb9c..f3a818d 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -137,7 +137,7 @@ ynh_system_user_create --username=$app
 ynh_print_info --message="Upgrading php-fpm configuration..."
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC UPGRADE