mirror of
https://github.com/YunoHost-Apps/wordpress_ynh.git
synced 2024-09-03 20:36:10 +02:00
Merge branch 'testing' into actions_config_panel
This commit is contained in:
commit
b4ccb6455d
2 changed files with 12 additions and 6 deletions
|
@ -171,7 +171,7 @@ wpcli_alias="php $final_path/wp-cli.phar --allow-root --path=$final_path"
|
||||||
$wpcli_alias plugin install simple-ldap-login
|
$wpcli_alias plugin install simple-ldap-login
|
||||||
$wpcli_alias plugin install http-authentication
|
$wpcli_alias plugin install http-authentication
|
||||||
$wpcli_alias plugin install companion-auto-update
|
$wpcli_alias plugin install companion-auto-update
|
||||||
$wpcli_alias plugin install wp-fail2ban
|
$wpcli_alias plugin install wp-fail2ban-redux
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# SET LANGUAGE
|
# SET LANGUAGE
|
||||||
|
@ -214,7 +214,7 @@ ynh_script_progression --message="Activating plugins..." --weight=4
|
||||||
$wpcli_alias plugin activate simple-ldap-login $plugin_network
|
$wpcli_alias plugin activate simple-ldap-login $plugin_network
|
||||||
# Do not activate http-authentication, this plugin is sometimes unstable
|
# Do not activate http-authentication, this plugin is sometimes unstable
|
||||||
$wpcli_alias plugin activate companion-auto-update $plugin_network
|
$wpcli_alias plugin activate companion-auto-update $plugin_network
|
||||||
$wpcli_alias plugin activate wp-fail2ban $plugin_network
|
$wpcli_alias plugin activate wp-fail2ban-redux $plugin_network
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# STORE THE CONFIG FILE CHECKSUM
|
# STORE THE CONFIG FILE CHECKSUM
|
||||||
|
|
|
@ -105,6 +105,12 @@ if [ -z "$overwrite_phpfpm" ]; then
|
||||||
ynh_app_setting_set --app=$app --key=overwrite_phpfpm --value=$overwrite_phpfpm
|
ynh_app_setting_set --app=$app --key=overwrite_phpfpm --value=$overwrite_phpfpm
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Replace wp-fail2ban by wp-fail2ban-redux
|
||||||
|
wget -nv https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -O $final_path/wp-cli.phar
|
||||||
|
wpcli_alias="php $final_path/wp-cli.phar --allow-root --path=$final_path"
|
||||||
|
$wpcli_alias plugin is-installed wp-fail2ban && $wpcli_alias plugin deactivate wp-fail2ban && $wpcli_alias plugin uninstall wp-fail2ban
|
||||||
|
$wpcli_alias plugin is-installed wp-fail2ban-redux || $wpcli_alias plugin install wp-fail2ban-redux
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# STANDARD UPGRADE STEPS
|
# STANDARD UPGRADE STEPS
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -208,8 +214,8 @@ ynh_app_setting_set --app=$app --key=multisite --value=$multisite
|
||||||
#=================================================
|
#=================================================
|
||||||
ynh_script_progression --message="Updating plugins" --weight=11
|
ynh_script_progression --message="Updating plugins" --weight=11
|
||||||
|
|
||||||
wget -nv https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -O $final_path/wp-cli.phar
|
# wget -nv https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -O $final_path/wp-cli.phar
|
||||||
wpcli_alias="php $final_path/wp-cli.phar --allow-root --path=$final_path"
|
# wpcli_alias="php $final_path/wp-cli.phar --allow-root --path=$final_path"
|
||||||
update_plugin () {
|
update_plugin () {
|
||||||
( $wpcli_alias plugin is-installed $1 && $wpcli_alias plugin update $1 ) || $wpcli_alias plugin install $1
|
( $wpcli_alias plugin is-installed $1 && $wpcli_alias plugin update $1 ) || $wpcli_alias plugin install $1
|
||||||
}
|
}
|
||||||
|
@ -217,8 +223,8 @@ update_plugin simple-ldap-login
|
||||||
$wpcli_alias plugin activate simple-ldap-login $plugin_network
|
$wpcli_alias plugin activate simple-ldap-login $plugin_network
|
||||||
update_plugin companion-auto-update
|
update_plugin companion-auto-update
|
||||||
$wpcli_alias plugin activate companion-auto-update $plugin_network
|
$wpcli_alias plugin activate companion-auto-update $plugin_network
|
||||||
update_plugin wp-fail2ban
|
update_plugin wp-fail2ban-redux
|
||||||
$wpcli_alias plugin activate wp-fail2ban $plugin_network
|
$wpcli_alias plugin activate wp-fail2ban-redux $plugin_network
|
||||||
|
|
||||||
# Disable broken plugin http-authentication
|
# Disable broken plugin http-authentication
|
||||||
$wpcli_alias plugin is-installed http-authentication && $wpcli_alias plugin deactivate http-authentication $plugin_network
|
$wpcli_alias plugin is-installed http-authentication && $wpcli_alias plugin deactivate http-authentication $plugin_network
|
||||||
|
|
Loading…
Add table
Reference in a new issue