Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix netdata mysql user in case of reinstall

Browse Source
This commit is contained in:
VirtuBox
2019-12-06 13:09:45 +01:00
parent d536f57cd9
commit 0e12bc29db
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wo/cli/plugins/stack_pref.py
View File

@@ -1410,11 +1410,15 @@ def post_pref(self, apt_packages, packages, upgrade=False):
try: try:
WOMysql.execute( WOMysql.execute(
self, self,
"create user 'netdata'@'localhost';", "DELETE FROM mysql.user WHERE User = 'netdata';",
log=False) log=False)
WOMysql.execute( WOMysql.execute(
self, self,
"grant usage on *.* to 'netdata'@'localhost';", "create user 'netdata'@'127.0.0.1';",
log=False)
WOMysql.execute(
self,
"grant usage on *.* to 'netdata'@'127.0.0.1';",
log=False) log=False)
WOMysql.execute( WOMysql.execute(
self, "flush privileges;", self, "flush privileges;",

18
wo/core/mysql.py
View File

@@ -108,17 +108,13 @@ class WOMysql():
if dbs == "": if dbs == "":
continue continue
Log.info(self, "Backing up {0} database".format(dbs)) Log.info(self, "Backing up {0} database".format(dbs))
p1 = subprocess.Popen("/usr/bin/mysqldump {0}" p1 = subprocess.Popen(
" --max_allowed_packet=1024M" "/usr/bin/mysqldump {0} --max_allowed_packet=1024M "
" --single-transaction".format(dbs), "--single-transaction ".format(dbs),
stdout=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
stderr=subprocess.PIPE, shell=True) p2 = subprocess.Popen(
p2 = subprocess.Popen("/usr/bin/pigz -c > " "/usr/bin/pigz -c > /var/lib/wo-backup/mysql/{0}{1}.sql.gz"
"/var/lib/wo-backup/mysql/{0}{1}.sql.gz" .format(dbs, WOVar.wo_date), stdin=p1.stdout, shell=True)
.format(dbs, WOVar.wo_date),
stdin=p1.stdout,
shell=True)
# Allow p1 to receive a SIGPIPE if p2 exits # Allow p1 to receive a SIGPIPE if p2 exits
p1.stdout.close() p1.stdout.close()
output = p1.stderr.read() output = p1.stderr.read()