From a8c8f2735df3c8454c586f12e69a90ab5fadc900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 15 Dec 2023 20:09:45 +0100 Subject: [PATCH] fix --- scripts/change_url | 7 ++++++- scripts/install | 3 --- scripts/restore | 1 - scripts/upgrade | 2 -- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index a264702..2e7a21c 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,6 +9,7 @@ source _common.sh source /usr/share/yunohost/helpers + #================================================= # MODIFY URL IN NGINX CONF #================================================= @@ -21,7 +22,11 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_replace_string --match_string="APP_URL=https://*" --replace_string="APP_URL=https://$new_domain" --target_file=$install_dir/.env +ynh_replace_string --match_string="APP_URL=https://$old_domain" --replace_string="APP_URL=https://$new_domain" --target_file=$install_dir/.env + +pushd $install_dir + php$phpversion artisan freescout:clear-cache +popd #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index bb8db37..57e8e48 100755 --- a/scripts/install +++ b/scripts/install @@ -21,7 +21,6 @@ timezone=$(cat /etc/timezone) #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -# Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" chmod -R o-rwx "$install_dir" @@ -36,10 +35,8 @@ find $install_dir -type d -exec chmod 775 {} \; #================================================= ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 -# Create a dedicated PHP-FPM config using the conf/php-fpm.conf or conf/extra_php-fpm.conf ynh_add_fpm_config -# Create a dedicated NGINX config using the conf/nginx.conf template ynh_add_nginx_config ynh_add_config --template="cron" --destination="/etc/cron.d/$app" diff --git a/scripts/restore b/scripts/restore index 4619525..79137eb 100755 --- a/scripts/restore +++ b/scripts/restore @@ -47,7 +47,6 @@ ynh_restore_file --origin_path="/etc/cron.d/$app" #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 -# Typically you only have either $app or php-fpm but not both at the same time... ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index ffd974b..74b6409 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,7 +13,6 @@ email=$(ynh_user_get_info --username=$admin --key=mail) firstname=$(ynh_user_get_info --username=$admin --key=firstname) lastname=$(ynh_user_get_info --username=$admin --key=lastname) - upgrade_type=$(ynh_check_app_version_changed) #================================================= @@ -28,7 +27,6 @@ then ynh_secure_remove --file="/$install_dir/vendor" - # Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" #--keep='.env' fi