diff --git a/conf/config.php b/conf/config.php index a4bc3b2..1eb12c5 100644 --- a/conf/config.php +++ b/conf/config.php @@ -1,15 +1,27 @@ 'https://__DOMAIN____PATH__', - 'storage' => [ + '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/extra_php-fpm.conf b/conf/extra_php-fpm.conf index 9dacb8a..1f6b70e 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -1,4 +1,4 @@ ; Additional php.ini defines, specific to this pool of workers. -php_admin_value[upload_max_filesize] = 512M -php_admin_value[post_max_size] = 512M +php_admin_value[upload_max_filesize] = 1G +php_admin_value[post_max_size] = 1G diff --git a/conf/nginx.conf b/conf/nginx.conf index e4bb875..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 512M; + client_max_body_size 1G; try_files $uri $uri/ __PATH__/index.php; diff --git a/manifest.toml b/manifest.toml index c644059..9034afe 100644 --- a/manifest.toml +++ b/manifest.toml @@ -48,10 +48,13 @@ ram.runtime = "50M" [resources.install_dir] [resources.data_dir] - subdirs = ["storage"] + #subdirs = ["storage"] [resources.permissions] main.url = "/" [resources.apt] - packages = "mariadb-server php8.2-sqlite3 php8.2-gd php8.2-fileinfo php8.2-zip" + 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/backup b/scripts/backup index 7792996..62ffbee 100755 --- a/scripts/backup +++ b/scripts/backup @@ -39,13 +39,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# BACKUP THE MYSQL DATABASE -#================================================= -ynh_print_info --message="Backing up the MySQL database..." - -ynh_mysql_dump_db --database="$db_name" > db.sql - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index a6bafe7..28274c0 100755 --- a/scripts/install +++ b/scripts/install @@ -15,7 +15,9 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" -#mkdir "$install_dir/storage" + +mkdir "$install_dir/storage" + chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/restore b/scripts/restore index 8415626..d4f2106 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,13 +37,6 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=1 - -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 94685dd..3bc3252 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,11 +24,21 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" + ynh_setup_source --dest_dir="$install_dir" --keep="config.php" fi chown -R $app:www-data "$install_dir" +#================================================= +# XBACKBONE UPGRADE +#================================================= +ynh_script_progression --message="Install database" --weight=1 + +pushd $install_dir + php$phpversion php/migrate --install + php$phpversion php/clean +popd + #================================================= # PHP-FPM CONFIGURATION #================================================= diff --git a/tests.toml b/tests.toml index 91daf17..8a6579f 100644 --- a/tests.toml +++ b/tests.toml @@ -4,4 +4,6 @@ test_format = 1.0 # ------------ # Tests to run - # ------------ \ No newline at end of file + # ------------ + + exclude = ["install.root"]