From 6a347628b92ea3987d55450f7f7fc7c04a47f8f5 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Tue, 3 Sep 2019 04:57:20 +0200 Subject: [PATCH] Fix wo_db_name & wo_db_username variable --- CHANGELOG.md | 1 + wo/cli/plugins/site_functions.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c737d8a..4342f79 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/), - Several typo or syntax errors - `wo site` errors due to broken symlinks for access.log or error.log - `wo clean` error due to unused memcached flag +- MySQL database and user variables overwrited in `wo site` ### v3.9.8.8 - 2019-09-02 diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index 251d98d..99d11d3 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -160,6 +160,7 @@ def setupdatabase(self, data): if not wo_db_name: wo_db_name = wo_replace_dot + wo_db_name = (wo_db_name[0:8] + generate_random()) if prompt_dbuser == 'True' or prompt_dbuser == 'true': try: @@ -173,12 +174,10 @@ def setupdatabase(self, data): if not wo_db_username: wo_db_username = wo_replace_dot + wo_db_username = (wo_db_name[0:8] + generate_random()) if not wo_db_password: wo_db_password = wo_random_pass - wo_db_username = (wo_db_name[0:8] + generate_random()) - wo_db_name = (wo_db_name[0:8] + generate_random()) - # create MySQL database Log.info(self, "Setting up database\t\t", end='') Log.debug(self, "Creating database {0}".format(wo_db_name))