From a9718cc0bcb9a9dbee4ee7d3737ee11e1c8bf569 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 31 Dec 2020 17:01:39 +0100 Subject: [PATCH 1/2] fix auto upgrade to major versions --- scripts/install | 2 ++ scripts/upgrade | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/scripts/install b/scripts/install index e4c6c69..c03e746 100644 --- a/scripts/install +++ b/scripts/install @@ -215,6 +215,8 @@ ynh_script_progression --message="Activating plugins..." --weight=4 $wpcli_alias plugin activate simple-ldap-login $plugin_network # Do not activate http-authentication, this plugin is sometimes unstable $wpcli_alias plugin activate companion-auto-update $plugin_network +# Enable the auto update of major versions +ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name <<< "UPDATE wp_auto_updates SET onoroff='on' WHERE wp_auto_updates.name='major';" $wpcli_alias plugin activate wp-fail2ban-redux $plugin_network #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4df9b47..adbed84 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -246,6 +246,12 @@ update_plugin simple-ldap-login $wpcli_alias plugin activate simple-ldap-login $plugin_network update_plugin companion-auto-update $wpcli_alias plugin activate companion-auto-update $plugin_network + + +# Enable the auto update of major versions +db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name <<< "UPDATE wp_auto_updates SET onoroff='on' WHERE wp_auto_updates.name='major';" + update_plugin wp-fail2ban-redux $wpcli_alias plugin activate wp-fail2ban-redux $plugin_network From 66714434cde32fcfc1dc72d2cbaed42cf36a69b3 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Tue, 19 Jan 2021 11:24:41 +0100 Subject: [PATCH 2/2] Force major upgrade only if it's an old version package --- manifest.json | 2 +- scripts/upgrade | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 00e8571..9943d2c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create a beautiful blog or website easily", "fr": "Logiciel de création de blog ou de site Web" }, - "version": "5.6~ynh1", + "version": "5.6~ynh2", "url": "https://wordpress.org/", "license": "GPL-2.0", "maintainer": { diff --git a/scripts/upgrade b/scripts/upgrade index adbed84..a037066 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -247,10 +247,14 @@ $wpcli_alias plugin activate simple-ldap-login $plugin_network update_plugin companion-auto-update $wpcli_alias plugin activate companion-auto-update $plugin_network - -# Enable the auto update of major versions -db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name <<< "UPDATE wp_auto_updates SET onoroff='on' WHERE wp_auto_updates.name='major';" +if ynh_compare_current_package_version --comparison lt --version 5.6~ynh2 +then + # Get the database table prefix + db_prefix=$(grep '^$table_prefix' "$final_path/wp-config.php" | sed "s/.*'\(.*\)'.*/\1/" ) + # Enable the auto update of major versions + db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) + ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name <<< "UPDATE ${db_prefix}auto_updates SET onoroff='on' WHERE ${db_prefix}auto_updates.name='major';" +fi update_plugin wp-fail2ban-redux $wpcli_alias plugin activate wp-fail2ban-redux $plugin_network