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] 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