From ffa54f55cdc45db670aa7021150050a0373ea57c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 2 Mar 2022 08:28:16 +0100
Subject: [PATCH] Testing (#58)

* 22.02.2
---
 README.md             | 3 ++-
 README_fr.md          | 8 +++++++-
 conf/.env.example     | 6 ++++--
 conf/app.src          | 4 ++--
 doc/DESCRIPTION.md    | 1 +
 doc/DESCRIPTION_fr.md | 9 +++++++++
 doc/DISCLAIMER_fr.md  | 5 +++++
 manifest.json         | 2 +-
 scripts/_common.sh    | 2 +-
 scripts/change_url    | 5 ++---
 scripts/install       | 2 +-
 scripts/upgrade       | 5 +++--
 12 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 doc/DESCRIPTION_fr.md

diff --git a/README.md b/README.md
index 3f0bbc5..dfae3ed 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 BookStack is an opinionated wiki system that provides a pleasant and simple out of the box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience.
 
 ### Features
+
 - Multi-Factor Authentication
 - Dark & Light Modes
 - LDAP Authentication
@@ -25,7 +26,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out
 - Multi-Lingual
 
 
-**Shipped version:** 22.02.1~ynh1
+**Shipped version:** 22.02.2~ynh1
 
 **Demo:** https://demo.bookstackapp.com
 
diff --git a/README_fr.md b/README_fr.md
index b7904e3..b692ced 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -14,6 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 BookStack is an opinionated wiki system that provides a pleasant and simple out of the box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience.
 
 ### Features
+
 - Multi-Factor Authentication
 - Dark & Light Modes
 - LDAP Authentication
@@ -21,7 +22,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out
 - Multi-Lingual
 
 
-**Version incluse :** 22.02.1~ynh1
+**Version incluse :** 22.02.2~ynh1
 
 **Démo :** https://demo.bookstackapp.com
 
@@ -31,7 +32,12 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out
 
 ## Avertissements / informations importantes
 
+## Configuration
 
+BookStack utilise l'authentification LDAP par défaut.
+
+Vous pouvez passer à l'authentification standard dans le webadmin -> Bookstack -> paramètre du panneau de configuration
+Pour la première connexion avec une authentification standard, utilisez les informations d'identification par défaut `admin@admin.com` et `password`. Vous devez modifier ces informations immédiatement après vous être connecté pour la première fois.
 
 ## Documentations et ressources
 
diff --git a/conf/.env.example b/conf/.env.example
index 7a89b8c..d1cd9be 100644
--- a/conf/.env.example
+++ b/conf/.env.example
@@ -6,6 +6,10 @@
 # NOTE: If any of your values contain a space or a hash you will need to
 # wrap the entire value in quotes. (eg. MAIL_FROM_NAME="BookStack Mailer")
 
+# Application environment
+# Can be 'production', 'development', 'testing' or 'demo'
+APP_ENV=production
+
 # Enable debug mode
 # Shows advanced debug information and errors.
 # CAN EXPOSE OTHER VARIABLES, LEAVE DISABLED
@@ -82,5 +86,3 @@ STORAGE_TYPE=local
 # Can be 'list' or 'grid'
 APP_VIEWS_BOOKS=list
 APP_VIEWS_BOOKSHELVES=grid
-
-
diff --git a/conf/app.src b/conf/app.src
index 954888d..508d2cc 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v22.02.1.tar.gz
-SOURCE_SUM=af2e816a3b78058f97de167c36560f2d3fa7cb4c680221a0f9d0a0b7a39fcd52
+SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v22.02.2.tar.gz
+SOURCE_SUM=7b7345c342bf665a2277ebaa9deead56010660606246d7b0b2d15119dcedf05f
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index df0b2ca..61c0c14 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1,6 +1,7 @@
 BookStack is an opinionated wiki system that provides a pleasant and simple out of the box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience.
 
 ### Features
+
 - Multi-Factor Authentication
 - Dark & Light Modes
 - LDAP Authentication
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
new file mode 100644
index 0000000..61c0c14
--- /dev/null
+++ b/doc/DESCRIPTION_fr.md
@@ -0,0 +1,9 @@
+BookStack is an opinionated wiki system that provides a pleasant and simple out of the box experience. New users to an instance should find the experience intuitive and only basic word-processing skills should be required to get involved in creating content on BookStack. The platform should provide advanced power features to those that desire it but they should not interfere with the core simple user experience.
+
+### Features
+
+- Multi-Factor Authentication
+- Dark & Light Modes
+- LDAP Authentication
+- Optional Markdown Editor
+- Multi-Lingual
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
index 8b13789..dc2bbb8 100644
--- a/doc/DISCLAIMER_fr.md
+++ b/doc/DISCLAIMER_fr.md
@@ -1 +1,6 @@
+## Configuration
 
+BookStack utilise l'authentification LDAP par défaut.
+
+Vous pouvez passer à l'authentification standard dans le webadmin -> Bookstack -> paramètre du panneau de configuration
+Pour la première connexion avec une authentification standard, utilisez les informations d'identification par défaut `admin@admin.com` et `password`. Vous devez modifier ces informations immédiatement après vous être connecté pour la première fois.
diff --git a/manifest.json b/manifest.json
index bcbe4c3..cb466de 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Platform to create documentation/wiki content",
         "fr": "Plateforme pour créer du contenu de documentation/wiki"
     },
-    "version": "22.02.1~ynh1",
+    "version": "22.02.2~ynh1",
     "url": "https://www.bookstackapp.com/",
     "upstream": {
         "license": "MIT",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 289f09f..83e5596 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,7 +8,7 @@ YNH_PHP_VERSION="8.0"
 
 pkg_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd"
 
-YNH_COMPOSER_VERSION=2.1.1
+YNH_COMPOSER_VERSION=2.2.7
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/change_url b/scripts/change_url
index c91cca3..6e51285 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -99,14 +99,13 @@ fi
 #=================================================
 ynh_script_progression --message="Reconfiguring congif file.." --weight=1
 
-new_app_url_domain="https://${new_domain}${new_path%/}"
 old_app_url_domain="https://${old_domain}${old_path%/}"
 
 pushd $final_path
-	yes | php$phpversion artisan bookstack:update-url $old_app_url_domain $new_app_url_domain
+	yes | php$phpversion artisan bookstack:update-url $old_app_url_domain https://${new_domain}${new_path}
 popd
 
-sed -i "/APP_URL=/c\APP_URL=$new_app_url_domain" $final_path/.env
+sed -i "/APP_URL=/c\APP_URL=https://${new_domain}${new_path}" $final_path/.env
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/install b/scripts/install
index 75927da..6ba3d02 100644
--- a/scripts/install
+++ b/scripts/install
@@ -114,7 +114,7 @@ ynh_add_fpm_config --usage=low --footprint=low
 ynh_script_progression --message="Installing BookStack with Composer..." --weight=5
 
 # Install composer
-ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--no-dev"
+ynh_install_composer
 
 #=================================================
 # MODIFY A CONFIG FILE
diff --git a/scripts/upgrade b/scripts/upgrade
index 6db94bf..93bacd1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -27,6 +27,7 @@ phpversion=$YNH_PHP_VERSION
 timezone="$(cat /etc/timezone)"
 redis_db=$(ynh_app_setting_get --app=$app --key=redis_db)
 mail_pwd=$(ynh_string_random --length=12)
+timezone="$(cat /etc/timezone)"
 
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
@@ -123,7 +124,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
+ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
 
 #=================================================
 # INSTALL LYCHEE WITH COMPOSER
@@ -131,7 +132,7 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
 ynh_script_progression --message="Installing BookStack with Composer..." --weight=5
 
 # Install composer
-ynh_install_composer --phpversion=$phpversion --workdir=$final_path --install_args="--no-dev"
+ynh_install_composer
 
 #=================================================
 # MODIFY A CONFIG FILE