From 9a5b3e3368709a5a21205218a0e493f9841d9249 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 7 Jan 2020 16:18:17 +0100 Subject: [PATCH] Fix mysql stack purge with remote db --- CHANGELOG.md | 1 + install | 1 + setup.py | 2 +- wo/cli/plugins/stack.py | 10 +++++++--- wo/cli/templates/wpcommon.mustache | 6 +++--- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2805715..ede69ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Domain IP validation when using CNAME before issuing SSL certificate - Netdata stack purge/remove not working properly +- Do not backup all databases when purging `--mysql` stack with remote MySQL server ### v3.11.2 - 2019-12-07 diff --git a/install b/install index 9c36d9c..1764d24 100755 --- a/install +++ b/install @@ -430,6 +430,7 @@ wo_install() { local python_ver python_ver=$(python3 -c "import sys; print(sys.version_info[1])") cd /usr/local/lib/python3."$python_ver"/dist-packages || exit 1 + rm -f /usr/local/bin/wo if [ "$wo_branch" = "master" ]; then python3 -m pip uninstall wo -y python3 -m pip install --upgrade wordops diff --git a/setup.py b/setup.py index 54b7ec6..2b267e7 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ if os.geteuid() == 0: os.makedirs('/var/lib/wo/tmp/') setup(name='wordops', - version='3.11.2', + version='3.11.3', description='An essential toolset that eases server administration', long_description=LONG, long_description_content_type='text/markdown', diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index e9dc7cb..51db16b 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -1130,10 +1130,14 @@ class WOStackController(CementBaseController): WOService.stop_service(self, 'fail2ban') if (set(["mariadb-server"]).issubset(set(apt_packages))): - if (os.path.isfile('/usr/bin/mysql') and - os.path.isdir('/var/lib/mysql')): + if self.app.config.has_section('stack'): + database_host = self.app.config.get( + 'stack', 'ip-address') + else: + database_host = 'na' + if database_host == '127.0.0.1': WOMysql.backupAll(self) - WOService.stop_service(self, 'mysql') + WOService.stop_service(self, 'mysql') # Netdata uninstaller if '/var/lib/wo/tmp/kickstart.sh' in packages: diff --git a/wo/cli/templates/wpcommon.mustache b/wo/cli/templates/wpcommon.mustache index 2955a95..d289112 100644 --- a/wo/cli/templates/wpcommon.mustache +++ b/wo/cli/templates/wpcommon.mustache @@ -48,7 +48,7 @@ location /wp-content/uploads { try_files $uri$webp_suffix $uri =404; } location ~* \.(php|gz|log|zip|tar|rar|xz)$ { - #Prevent Direct Access Of PHP Files & BackupsFrom Web Browsers + #Prevent Direct Access Of PHP Files & Backups from Web Browsers deny all; } } @@ -95,6 +95,6 @@ location ~ \/wp-admin\/load-(scripts|styles).php { deny all; } # Protect Easy Digital Download files from being accessed directly. -location ~ ^/wp-content/uploads/edd/(.*?)\.zip$ { - rewrite / permanent; +location ~ ^/wp-content/uploads/edd/(.*?)\.zip$ { + rewrite / permanent; }