From 1c10e5c79c9bb2769cd4259f86a8a0411c903044 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 15:04:53 +0200 Subject: [PATCH 1/5] fix --- conf/config_old.php | 2 +- conf/extra_php-fpm.conf | 4 ++-- conf/nginx.conf | 2 +- scripts/install | 6 ++++-- scripts/upgrade | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/conf/config_old.php b/conf/config_old.php index 7ab9a12..296bd9d 100644 --- a/conf/config_old.php +++ b/conf/config_old.php @@ -21,6 +21,6 @@ return array( 'base_domain' => '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 700c37c..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] = 50M -php_admin_value[post_max_size] = 50M +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 09c2f3a..c010a37 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 50M; + #client_max_body_size 1G; try_files $uri $uri/ __PATH__/index.php; diff --git a/scripts/install b/scripts/install index 49da682..95126d7 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" + chown -R $app:www-data "$install_dir" #================================================= @@ -24,7 +26,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --usage=low --footprint=low #================================================= # NGINX CONFIGURATION @@ -39,7 +41,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.php" --destination="$install_dir/config.php" +ynh_add_config --template="../conf/config_old.php" --destination="$install_dir/config.php" chmod 400 "$install_dir/config.php" chown $app:$app "$install_dir/config.php" diff --git a/scripts/upgrade b/scripts/upgrade index 61574c5..240e237 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,7 @@ 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" @@ -35,7 +35,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_add_fpm_config --usage=low --footprint=low #================================================= # NGINX CONFIGURATION From 8efa8573d8bfa6bce6c05c07e13452cd42f6bd6c 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 15:21:01 +0200 Subject: [PATCH 2/5] fix --- conf/config.php | 2 +- conf/config_old.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/conf/config.php b/conf/config.php index be0fefb..5cc9ed3 100644 --- a/conf/config.php +++ b/conf/config.php @@ -4,7 +4,7 @@ return [ 'base_url' => 'https://__DOMAIN____PATH__', // no trailing slash 'storage' => [ 'driver' => 'local', - 'path' => '__INSTALL_DIR__/storage', + 'path' => '__DATA_DIR__/storage', ], 'db' => [ 'connection' => 'sqlite', diff --git a/conf/config_old.php b/conf/config_old.php index 296bd9d..1eb12c5 100644 --- a/conf/config_old.php +++ b/conf/config_old.php @@ -16,11 +16,12 @@ return array( 'ldap' => array( 'enabled' => true, + 'schema' => 'ldap', 'host' => 'ldap://127.0.0.1', 'port' => 389, - 'base_domain' => 'dc=yunohost,dc=org', + '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=', - ) + ), ); - 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 3/5] 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 @@ '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 @@ - '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" From 595c85f0743608a65edc9342ba4b4d26a56f1ff0 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:07:30 +0200 Subject: [PATCH 4/5] Create tests.toml --- tests.toml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 tests.toml diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..91daf17 --- /dev/null +++ b/tests.toml @@ -0,0 +1,7 @@ +test_format = 1.0 + +[default] + + # ------------ + # Tests to run + # ------------ \ No newline at end of file From 3c2804808f2941cc07f26b03709ae351c0c21a63 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:25:33 +0200 Subject: [PATCH 5/5] Update upgrade --- scripts/upgrade | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 240e237..3bc3252 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,6 +29,16 @@ 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 #================================================= @@ -37,11 +47,6 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - # Create a dedicated NGINX config ynh_add_nginx_config