diff --git a/bin/easyengine b/bin/easyengine index 548fa0e8..0961b9cd 100644 --- a/bin/easyengine +++ b/bin/easyengine @@ -725,7 +725,7 @@ elif [ "$EE_FIRST" = "site" ]; then ee_lib_service nginx reload # Git commit - ee_lib_git /etc/nginx/ "$EE_DOMAIN updated with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options" + ee_lib_git /etc/nginx/ "After ee site update: $EE_DOMAIN updated with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options" # Display Success Message ee_lib_echo_info "Successfully Updated Website: http://$EE_WWW_DOMAIN" diff --git a/src/modules/site/update/ee_mod_update_cache.sh b/src/modules/site/update/ee_mod_update_cache.sh deleted file mode 100644 index 38eec6d7..00000000 --- a/src/modules/site/update/ee_mod_update_cache.sh +++ /dev/null @@ -1,30 +0,0 @@ -# Update cache plugins - -function ee_mod_update_plugins() -{ - cd /var/www/$EE_DOMAIN/htdocs/ - - if [ "$EE_SITE_CURRENT_OPTION" = "WPSINGLE W3 TOTAL CACHE" ] || [ "$EE_SITE_CURRENT_OPTION" = "WPSINGLE FAST CGI" ] \ - || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDIR W3 TOTAL CACHE" ] || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDIR FAST CGI" ] \ - || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDOMAIN W3 TOTAL CACHE" ] || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDOMAIN FAST CGI" ] && [ "$EE_SITE_CACHE_OPTION" = "--basic" ]; then - ee_lib_echo "Uninstalling W3 Total Cache plugin, please wait..." - wp plugin --allow-root uninstall w3-total-cache &>> $EE_COMMAND_LOG - fi - - if [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDOMAIN WP SUPER CACHE" ] || [ "$EE_SITE_CURRENT_OPTION" = "WPSINGLE WP SUPER CACHE" ] \ - || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDIR WP SUPER CACHE" ] && [ "$EE_SITE_CACHE_OPTION" = "--basic" ]; then - ee_lib_echo "Unnstalling WP Super Cache plugin, please wait..." - wp plugin --allow-root uninstall wp-super-cache &>> $EE_COMMAND_LOG - fi - - if [ "$EE_SITE_CURRENT_OPTION" != "WPSINGLE WP SUPER CACHE" ] && [ "$EE_SITE_CURRENT_OPTION" != "WPSUBDIR WP SUPER CACHE" ] \ - && [ "$EE_SITE_CURRENT_OPTION" != "WPSUBDOMAIN WP SUPER CACHE" ] && [ "$EE_SITE_CACHE_OPTION" = "--wpsc" ]; then - ee_mod_plugin_wpsc - fi - - if [ "$EE_SITE_CURRENT_OPTION" != "WPSINGLE W3 TOTAL CACHE" ] && [ "$EE_SITE_CURRENT_OPTION" != "WPSUBDIR W3 TOTAL CACHE" ] \ - || [ "$EE_SITE_CURRENT_OPTION" != "WPSUBDOMAIN W3 TOTAL CACHE" ] && [ "$EE_SITE_CURRENT_OPTION" != "WPSINGLE FAST CGI" ] || [ "$EE_SITE_CURRENT_OPTION" != "WPSUBDIR FAST CGI" ] \ - || [ "$EE_SITE_CURRENT_OPTION" != "WPSUBDOMAIN FAST CGI" ] && [[ "$EE_SITE_CACHE_OPTION" = "--wpfc" || "$EE_SITE_CACHE_OPTION" = "--w3tc" ]]; then - ee_mod_plugin_w3tc - fi -} diff --git a/src/modules/site/update/ee_mod_update_domain.sh b/src/modules/site/update/ee_mod_update_domain.sh index c2dc9a32..3ef5bfb0 100644 --- a/src/modules/site/update/ee_mod_update_domain.sh +++ b/src/modules/site/update/ee_mod_update_domain.sh @@ -3,7 +3,7 @@ function ee_mod_update_domain() { # Git commit - ee_lib_git /etc/nginx/ "Before $EE_DOMAIN updated with $EE_SITE_CREATE_OPTION $EE_SITE_CACHE_OPTION options" + ee_lib_git /etc/nginx/ "Before ee site update: $EE_DOMAIN running on $EE_SITE_CURRENT_OPTION" # Backup NGINX configuration & Database & Webroot ee_mod_site_backup diff --git a/src/modules/site/update/ee_mod_update_plugins.sh b/src/modules/site/update/ee_mod_update_plugins.sh index 38eec6d7..b50df163 100644 --- a/src/modules/site/update/ee_mod_update_plugins.sh +++ b/src/modules/site/update/ee_mod_update_plugins.sh @@ -6,14 +6,15 @@ function ee_mod_update_plugins() if [ "$EE_SITE_CURRENT_OPTION" = "WPSINGLE W3 TOTAL CACHE" ] || [ "$EE_SITE_CURRENT_OPTION" = "WPSINGLE FAST CGI" ] \ || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDIR W3 TOTAL CACHE" ] || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDIR FAST CGI" ] \ - || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDOMAIN W3 TOTAL CACHE" ] || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDOMAIN FAST CGI" ] && [ "$EE_SITE_CACHE_OPTION" = "--basic" ]; then + || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDOMAIN W3 TOTAL CACHE" ] || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDOMAIN FAST CGI" ] && [[ "$EE_SITE_CACHE_OPTION" = "--basic" || "$EE_SITE_CACHE_OPTION" = "--wpsc" ]]; then ee_lib_echo "Uninstalling W3 Total Cache plugin, please wait..." wp plugin --allow-root uninstall w3-total-cache &>> $EE_COMMAND_LOG fi if [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDOMAIN WP SUPER CACHE" ] || [ "$EE_SITE_CURRENT_OPTION" = "WPSINGLE WP SUPER CACHE" ] \ || [ "$EE_SITE_CURRENT_OPTION" = "WPSUBDIR WP SUPER CACHE" ] && [ "$EE_SITE_CACHE_OPTION" = "--basic" ]; then - ee_lib_echo "Unnstalling WP Super Cache plugin, please wait..." + ee_lib_echo "Unistalling WP Super Cache plugin, please wait..." + wp plugin --allow-root uninstall wp-super-cache &>> $EE_COMMAND_LOG fi