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

Fix mariaDB key

Browse Source
This commit is contained in:
VirtuBox
2019-10-09 17:35:23 +02:00
parent 8d47374c2a
commit ab6d44afd4
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup.py
View File

@@ -5,7 +5,7 @@ import os
from setuptools import find_packages, setup from setuptools import find_packages, setup
with open("README.md", "r") as fh: with open("README.md", "r") as fh:
long_description = fh.read() LONG = fh.read()
conf = [] conf = []
templates = [] templates = []
@@ -26,8 +26,7 @@ if os.geteuid() == 0:
setup(name='wordops', setup(name='wordops',
version='3.9.9.3', version='3.9.9.3',
description='WordPress & server administration toolset', description='WordPress & server administration toolset',
long_description=long_description, long_description=LONG,
long_description_content_type="text/markdown",
classifiers=[ classifiers=[
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",
"License :: OSI Approved :: MIT License", "License :: OSI Approved :: MIT License",

4
wo/cli/plugins/stack.py
View File

@@ -168,14 +168,14 @@ class WOStackController(CementBaseController):
if WOAptGet.is_installed(self, 'nginx-plus'): if WOAptGet.is_installed(self, 'nginx-plus'):
Log.info(self, "NGINX PLUS Detected ...") Log.info(self, "NGINX PLUS Detected ...")
apt = ["nginx-plus"] + WOVar.wo_nginx apt = ["nginx-plus"] + WOVar.wo_nginx
self.post_pref(apt, empty_packages) post_pref(self, apt, empty_packages)
elif WOAptGet.is_installed(self, 'nginx'): elif WOAptGet.is_installed(self, 'nginx'):
Log.info(self, "WordOps detected an already " Log.info(self, "WordOps detected an already "
"installed nginx package." "installed nginx package."
"It may or may not have " "It may or may not have "
"required modules.\n") "required modules.\n")
apt = ["nginx"] + WOVar.wo_nginx apt = ["nginx"] + WOVar.wo_nginx
self.post_pref(apt, empty_packages) post_pref(self, apt, empty_packages)
else: else:
Log.debug(self, "Nginx already installed") Log.debug(self, "Nginx already installed")

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

@@ -41,9 +41,9 @@ def pre_pref(self, apt_packages):
mysql_pref_file.write(mysql_pref) mysql_pref_file.write(mysql_pref)
WORepo.add(self, repo_url=WOVar.wo_mysql_repo) WORepo.add(self, repo_url=WOVar.wo_mysql_repo)
WORepo.add_key(self, '0xcbcb082a1bb943db', WORepo.add_key(self, '0xcbcb082a1bb943db',
keyserver='keys.gnupg.net') keyserver='keyserver.ubuntu.com')
WORepo.add_key(self, '0xF1656F24C74CD1D8', WORepo.add_key(self, '0xF1656F24C74CD1D8',
keyserver='keys.gnupg.net') keyserver='keyserver.ubuntu.com')
if "mariadb-server" in apt_packages: if "mariadb-server" in apt_packages:
# generate random 24 characters root password # generate random 24 characters root password
chars = ''.join(random.sample(string.ascii_letters, 24)) chars = ''.join(random.sample(string.ascii_letters, 24))