From 081f5c770188b49980106dd5dffa158a1d2ef65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 15 Sep 2023 16:27:26 +0200 Subject: [PATCH] Fix: install LocalSettings file on upgrade too --- scripts/install | 4 ++-- scripts/upgrade | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index e44716b..f938d4c 100644 --- a/scripts/install +++ b/scripts/install @@ -70,8 +70,6 @@ else mediawiki_path="$path" fi -wiki_name_underscorified="${wiki_name//[^a-zA-Z0-9]/_}" - pushd "$install_dir" || ynh_die "Could not pushd $install_dir" "php$phpversion" "$install_dir/maintenance/install.php" \ --server "https://$domain" \ @@ -93,6 +91,8 @@ ynh_script_progression --message="Adding a configuration file..." # save the original LocalSettings.php for eventual debugging mv "$install_dir/LocalSettings.php" "$install_dir/LocalSettings.php.orig" +wiki_name_underscorified="${wiki_name//[^a-zA-Z0-9]/_}" + ynh_add_config --template="../conf/LocalSettings.php" --destination="$install_dir/LocalSettings.php" # This is required to update database schemas diff --git a/scripts/upgrade b/scripts/upgrade index ea73463..335274d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -103,6 +103,10 @@ else mediawiki_path="$path" fi +wiki_name_underscorified="${wiki_name//[^a-zA-Z0-9]/_}" + +ynh_add_config --template="../conf/LocalSettings.php" --destination="$install_dir/LocalSettings.php" + # Check for admin password being too short for the new mediawiki requirements password_length=$(ynh_app_setting_get --app=$app --key=password | awk '{print length}') if (( password_length < 10 )); then