From d78491a9e34bf1e6118adad34a357f2ce56d829f Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 4 Aug 2021 13:31:31 +0200
Subject: [PATCH] Fix

---
 conf/config_local.php | 13 ++++++++-----
 manifest.json         |  1 +
 scripts/install       |  2 ++
 scripts/upgrade       |  1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/conf/config_local.php b/conf/config_local.php
index 4eb4302..3c8d2df 100644
--- a/conf/config_local.php
+++ b/conf/config_local.php
@@ -14,8 +14,14 @@
      * containing all the formats.
      * BEWARE : it has to end with a /
      */
-    $config['calibre_directory'] = '__DOMAIN____PATH__';
+    $config['calibre_directory'] = '__CALIBRE__';
+
+    $config['calibre_internal_directory'] = '/Calibre/';
     
+    $config['cops_full_url'] = '__DOMAIN____PATH__ '; 
+
+    $config['cops_x_accel_redirect'] = "X-Accel-Redirect";
+
     /*
      * Catalog's title
      */
@@ -27,7 +33,7 @@
      *  1 : enable
      *  0 : disable
      */
-    $config['cops_use_url_rewriting'] = "0";
+    $config['cops_use_url_rewriting'] = "1";
 
         /*
      * Set language code to force a language (see lang/ directory for available languages).
@@ -41,6 +47,3 @@
      * http://www.php.net/manual/en/timezones.php
      */
     $config['default_timezone'] = '__TIMEZONE__';
-
-
-
diff --git a/manifest.json b/manifest.json
index afc7973..469264b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,6 +51,7 @@
             },
             {
                 "name": "calibre",
+                "type": "string",
                 "ask": {
                     "en": "Indicate the location of Calibre library. DON'T store it in your /var/www/cops or it will be removed on next upgrade !!",
                     "fr": "Indiquez le chemin de votre bibliotheque Calibre. Ne la mettez pas dans /var/www/cops ou elle sera supprimée à la prochaine upgrade !!!"
diff --git a/scripts/install b/scripts/install
index f507a05..942c709 100755
--- a/scripts/install
+++ b/scripts/install
@@ -29,6 +29,7 @@ path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANGUAGE
 timezone="$(cat /etc/timezone)"
+calibre=$YNH_APP_ARG_CALIBRE
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -51,6 +52,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 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=language --value=$language
+ynh_app_setting_set --app=$app --key=calibre --value=$calibre
 
 #=================================================
 # STANDARD MODIFICATIONS
diff --git a/scripts/upgrade b/scripts/upgrade
index 448f05b..9a90bdc 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -20,6 +20,7 @@ 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)
 language=$(ynh_app_setting_get --app=$app --key=language)
+calibre=$(ynh_app_setting_get --app=$app --key=calibre)
 
 #=================================================
 # CHECK VERSION