From 814a90d6366971285b33e4b86625e2bcff39b72f Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 22 Mar 2022 13:48:24 +0100
Subject: [PATCH] Fix

---
 conf/config.ini    | 11 +++++++++++
 conf/defaults.ini  |  2 +-
 manifest.json      |  1 -
 scripts/_common.sh |  2 +-
 scripts/install    |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 conf/config.ini

diff --git a/conf/config.ini b/conf/config.ini
new file mode 100644
index 0000000..fdcb8c8
--- /dev/null
+++ b/conf/config.ini
@@ -0,0 +1,11 @@
+[globals]
+db_type=mysql
+db_host=localhost
+db_database=__DB_NAME__
+db_username=__DB_USER__
+db_password=__DB_PWD__
+db_port=3306
+
+username=__ADMIN__
+password=__PASSWORD__
+salt=__SALT__
diff --git a/conf/defaults.ini b/conf/defaults.ini
index fc17e70..6194928 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -12,7 +12,7 @@ logger_destination=file:data/logs/default.log
 logger_level=DEBUG
 items_perpage=50
 items_lifetime=30
-base_url=__PATH__/
+base_url=/
 username=__ADMIN__
 password=__PASSWORD__
 salt=__SALT__
diff --git a/manifest.json b/manifest.json
index d58bc17..9239aac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -11,7 +11,6 @@
     "upstream": {
         "license": "AGPL-3.0-only",
         "website": "https://selfoss.aditu.de/",
-        "demo": "https://demo.example.com",
         "admindoc": "https://github.com/fossar/selfoss/wiki",
         "userdoc": "https://selfoss.aditu.de/",
         "code": "https://github.com/fossar/selfoss"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 09586e3..d7e8145 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,7 +7,7 @@
 YNH_PHP_VERSION="7.3"
 
 # dependencies used by the app
-pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl"
+pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index 8888c67..ea2db47 100755
--- a/scripts/install
+++ b/scripts/install
@@ -112,7 +112,7 @@ ynh_add_fpm_config --usage=low --footprint=low
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/defaults.ini" --destination="$final_path/config.ini"
+ynh_add_config --template="../conf/config.ini" --destination="$final_path/config.ini"
 
 chmod 400 "$final_path/config.ini"
 chown $app:$app "$final_path/config.ini"