From 10c9f984eac857c3a252f58ce830e66e827990c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 19 Aug 2023 17:05:19 +0200
Subject: [PATCH] fix

---
 conf/config.php     | 36 ++++++++++++++++++++++++------------
 conf/config_old.php | 27 ---------------------------
 conf/nginx.conf     |  2 +-
 manifest.toml       |  2 +-
 scripts/install     |  2 +-
 5 files changed, 27 insertions(+), 42 deletions(-)
 delete mode 100644 conf/config_old.php

diff --git a/conf/config.php b/conf/config.php
index 5cc9ed3..1eb12c5 100644
--- a/conf/config.php
+++ b/conf/config.php
@@ -1,15 +1,27 @@
 <?php
 
-return [
-    'base_url' => 'https://__DOMAIN____PATH__', // no trailing slash
-    'storage' => [
+return array(
+    'base_url' => 'https://__DOMAIN____PATH__',
+    'db' => array (
+        'connection' => 'mysql',
+        'dsn' => 'host=localhost;port=3306;dbname=__DB_USER__',
+        'username' => '__DB_USER__',
+        'password' => '__DB_PWD__',
+    ),
+
+    'storage'  => array(
         'driver' => 'local',
-        'path'   => '__DATA_DIR__/storage',
-    ],
-    'db'       => [
-        'connection' => 'sqlite',
-        'dsn'        => '__INSTALL_DIR__/resources/database/xbackbone.db',
-        'username'   => null,
-        'password'   => null,
-    ]
-];
+        'path'   => '__DATA_DIR__',
+    ),
+
+    'ldap' => array(
+        'enabled' => true,
+        'schema' => 'ldap',
+        'host' => 'ldap://127.0.0.1',
+        'port' => 389,
+        'base_domain' => 'dc=yunohost,dc=org', 
+        'search_filter' => '(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))',
+        'user_domain' => 'ou=Users',
+        'rdn_attribute' => 'uid=',
+    ),
+);
diff --git a/conf/config_old.php b/conf/config_old.php
deleted file mode 100644
index 1eb12c5..0000000
--- a/conf/config_old.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-return array(
-    'base_url' => 'https://__DOMAIN____PATH__',
-    'db' => array (
-        'connection' => 'mysql',
-        'dsn' => 'host=localhost;port=3306;dbname=__DB_USER__',
-        'username' => '__DB_USER__',
-        'password' => '__DB_PWD__',
-    ),
-
-    'storage'  => array(
-        'driver' => 'local',
-        'path'   => '__DATA_DIR__',
-    ),
-
-    'ldap' => array(
-        'enabled' => true,
-        'schema' => 'ldap',
-        'host' => 'ldap://127.0.0.1',
-        'port' => 389,
-        'base_domain' => 'dc=yunohost,dc=org', 
-        'search_filter' => '(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))',
-        'user_domain' => 'ou=Users',
-        'rdn_attribute' => 'uid=',
-    ),
-);
diff --git a/conf/nginx.conf b/conf/nginx.conf
index c010a37..305e968 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -6,7 +6,7 @@ location __PATH__/ {
 
   index index.html index.htm index.php;
 
-  #client_max_body_size 1G;
+  client_max_body_size 1G;
 
   try_files $uri $uri/ __PATH__/index.php;
 
diff --git a/manifest.toml b/manifest.toml
index 8d15e9d..2476823 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -52,7 +52,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server php8.2-sqlite3 php8.2-mysql php8.2-gd php8.2-fileinfo php8.2-zip php8.2-ldap"
+    packages = "mariadb-server php8.2-intl php8.2-mysql php8.2-gd php8.2-fileinfo php8.2-zip php8.2-ldap"
 
     [resources.database]
     type = "mysql"
diff --git a/scripts/install b/scripts/install
index 95126d7..28274c0 100755
--- a/scripts/install
+++ b/scripts/install
@@ -41,7 +41,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/config_old.php" --destination="$install_dir/config.php"
+ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php"
 
 chmod 400 "$install_dir/config.php"
 chown $app:$app "$install_dir/config.php"