diff --git a/check_process b/check_process index 4763159..a1f6cf8 100755 --- a/check_process +++ b/check_process @@ -13,8 +13,6 @@ setup_private=1 setup_public=1 upgrade=1 - #1.0.0 alpha.64 - upgrade=1 from_commit=8ae9bec1e274f8764ad0a5db5297542c3274d999 #1.0.0 alpha.75 upgrade=1 from_commit=c8a5545d2b1d61342d837b7608fdc64a5b71b25b backup_restore=1 @@ -24,8 +22,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=8ae9bec1e274f8764ad0a5db5297542c3274d999 - name=1.0.0 alpha.64 ; commit=c8a5545d2b1d61342d837b7608fdc64a5b71b25b name=1.0.0 alpha.75 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass& diff --git a/conf/nginx.conf b/conf/nginx.conf index 8182362..c5aa3be 100755 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,7 +8,6 @@ location / { client_max_body_size 512M; try_files $uri $uri/ /index.php; - location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; diff --git a/manifest.json b/manifest.json index 2a72df6..f8390af 100755 --- a/manifest.json +++ b/manifest.json @@ -26,7 +26,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php8.0-fpm", "mysql" ], "arguments": { diff --git a/scripts/install b/scripts/install index 4601b70..e4c7888 100755 --- a/scripts/install +++ b/scripts/install @@ -104,7 +104,6 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SPECIFIC SETUP @@ -128,6 +127,8 @@ chown $app:www-data "$final_path/.env" ynh_script_progression --message="Setuping a cron..." ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" #================================================= # SETUP APPLICATION WITH CURL diff --git a/scripts/restore b/scripts/restore index 139b58a..b84019a 100755 --- a/scripts/restore +++ b/scripts/restore @@ -93,8 +93,11 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= # RESTORE VARIOUS FILES #================================================= +ynh_script_progression --message="Restoring cron job..." --weight=1 ynh_restore_file --origin_path="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 598f6c3..11035f9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -129,9 +129,11 @@ chown $app:www-data "$final_path/.env" #================================================= # SETUP CRON #================================================= -ynh_script_progression --message="Setuping cron..." +ynh_script_progression --message="Setuping cron..." --weight=1 ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +chown root: "/etc/cron.d/$app" +chmod 644 "/etc/cron.d/$app" #================================================= # RELOAD NGINX