Fix

README_fr.md

@@ -0,0 +1,71 @@
+# BookStack pour YunoHost
+
+[![Integration level](https://dash.yunohost.org/integration/bookstack.svg)](https://dash.yunohost.org/appci/app/bookstack) ![](https://ci-apps.yunohost.org/ci/badges/bookstack.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/bookstack.maintain.svg)  
+[![Installer BookStack avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=bookstack)
+
+*[Read this readme in english.](./README.md)* 
+
+> *Ce package vous permet d'installer BookStack rapidement et simplement sur un serveur YunoHost.  
+Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+
+## Overview
+BookStack est une plate-forme simple, auto-hébergée et facile à utiliser pour organiser et stocker des informations.
+
+**Version incluse :** 0.31.4
+
+## Screenshots
+
+![](https://www.bookstackapp.com/images/bookstack-hero-screenshot.jpg)
+
+## Démo
+
+* [Démo officielle](https://demo.bookstackapp.com/)
+
+## Configuration
+Login using the default admin details `admin@admin.com` with a password of `password`. You should change these details immediately after logging in for the first time.
+How to configure this app: From an admin panel, a plain file with SSH, or any other way.
+
+## Documentation
+
+ * Documentation officielle : https://www.bookstackapp.com/docs/
+ * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer.
+
+## Caractéristiques spécifiques YunoHost
+
+#### Support multi-utilisateur
+
+* L'authentification LDAP et HTTP est-elle prise en charge ?
+* L'application peut-elle être utilisée par plusieurs utilisateurs ?
+
+#### Architectures supportées
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/bookstack%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/bookstack/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/bookstack%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/bookstack/)
+
+## Limitations
+
+* Limitations connues.
+
+## Informations additionnelles
+
+* Autres informations que vous souhaitez ajouter sur cette application.
+
+## Liens
+
+ * Signaler un bug : https://github.com/YunoHost-Apps/bookstack_ynh/issues
+ * Site de l'application : https://www.bookstackapp.com/
+ * Dépôt de l'application principale : https://github.com/BookStackApp/BookStack
+ * Site web YunoHost : https://yunohost.org/
+
+---
+
+## Informations pour les développeurs
+
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/bookstack_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/bookstack_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade bookstack -u https://github.com/YunoHost-Apps/bookstack_ynh/tree/testing --debug
+```

conf/.env.example

@@ -18,7 +18,7 @@ APP_KEY=SomeRandomString
 # If you change this in the future you may need to run a command
 # to update stored URLs in the database. Command example:
 # php artisan bookstack:update-url https://old.example.com https://new.example.com
-APP_URL=https:__DOMAIN____PATH__
+#APP_URL=https:__DOMAIN____PATH__
 
 # Application default language
 # The default language choice to show.

conf/nginx.conf

@@ -2,7 +2,7 @@
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/public/ ;
+  alias __FINALPATH__/public/;
 
   # Force usage of https
   if ($scheme = http) {
@@ -10,13 +10,13 @@ location __PATH__/ {
   }
 
   index index.php;
-  try_files $uri $uri/ @bookstack;
+  #try_files $uri $uri/ @bookstack;
+
+  #try_files $uri $uri/ /index.php;
 
-  #try_files $uri $uri/ index.php;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
-
     fastcgi_index index.php;
     include fastcgi_params;
     fastcgi_param REMOTE_USER     $remote_user;
@@ -28,6 +28,6 @@ location __PATH__/ {
   include conf.d/yunohost_panel.conf.inc;
 }
 
-location @bookstack {
-      rewrite ^__PATH__/(.*)$ __PATH__/index.php?/$1 last;
-}
+#location @bookstack {
+#      rewrite ^__PATH__/(.*)$ __PATH__/index.php?/$1 last;
+#}

scripts/change_url

@@ -98,6 +98,20 @@ then
 	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
 fi
 
+#=================================================
+# MODIFY A CONFIG FILE
+#=================================================
+
+cp -a ../conf/.env.example $final_path/.env
+
+ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/.env"
+ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/.env"
+ynh_replace_string --match_string="__DOMAIN__" --replace_string="$new_domain" --target_file="$final_path/.env"
+ynh_replace_string --match_string="__PATH__" --replace_string="$new_path" --target_file="$final_path/.env"
+ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/.env"
+
+ynh_store_file_checksum $final_path/.env
+
 #=================================================
 # RELOAD NGINX
 #=================================================

scripts/restore

@@ -67,7 +67,7 @@ ynh_system_user_create --username=$app
 #=================================================
 
 # Restore permissions on app files
-chown -R root: $final_path
+chown -R $app: $final_path
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION

scripts/upgrade

@@ -102,7 +102,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies"
 #=================================================
 
 # Set permissions on app files
-chown -R root: $final_path
+chown -R $app: $final_path
 
 #=================================================
 # RELOAD NGINX