diff --git a/check_process b/check_process deleted file mode 100644 index 98cba45..0000000 --- a/check_process +++ /dev/null @@ -1,25 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - admin="john" - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=0 - setup_public=0 - upgrade=1 - upgrade=1 from_commit=7e3914481ac4d6c40f3be3f35f155fac6f4387c6 - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=CommitHash - name=16.0.5 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER& diff --git a/conf/nginx.conf b/conf/nginx.conf index 35f8581..eae8d07 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __INSTALL_DIR__/htdocs/ ; + alias __INSTALL_DIR__/htdocs/; index index.php; diff --git a/scripts/restore b/scripts/restore index 6590cc8..b16dcb1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -48,8 +48,8 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name="php$phpversion-fpm" --action=reload +ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/tests.toml b/tests.toml index 35a337a..8544194 100644 --- a/tests.toml +++ b/tests.toml @@ -4,8 +4,10 @@ test_format = 1.0 [default] - # ------------ - # Tests to run - # ------------ + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- + test_upgrade_from.8f6e1a302a943607aa640bbcb44405c8cb0a513d.name = "Upgrade from 18.0.3" + test_upgrade_from.c91139d3859032c3982b4bba3943aeae3ca57948.name = "15.0.3" test_upgrade_from.7e3914481ac4d6c40f3be3f35f155fac6f4387c6.name = "old version"