diff --git a/setup.py b/setup.py index ce63717..c47ef64 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ import os from setuptools import find_packages, setup with open("README.md", "r") as fh: - long_description = fh.read() + LONG = fh.read() conf = [] templates = [] @@ -26,8 +26,7 @@ if os.geteuid() == 0: setup(name='wordops', version='3.9.9.3', description='WordPress & server administration toolset', - long_description=long_description, - long_description_content_type="text/markdown", + long_description=LONG, classifiers=[ "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License", diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index ab75744..e66c8b4 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -168,14 +168,14 @@ class WOStackController(CementBaseController): if WOAptGet.is_installed(self, 'nginx-plus'): Log.info(self, "NGINX PLUS Detected ...") apt = ["nginx-plus"] + WOVar.wo_nginx - self.post_pref(apt, empty_packages) + post_pref(self, apt, empty_packages) elif WOAptGet.is_installed(self, 'nginx'): Log.info(self, "WordOps detected an already " "installed nginx package." "It may or may not have " "required modules.\n") apt = ["nginx"] + WOVar.wo_nginx - self.post_pref(apt, empty_packages) + post_pref(self, apt, empty_packages) else: Log.debug(self, "Nginx already installed") diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 2bcce47..b1068d4 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -41,9 +41,9 @@ def pre_pref(self, apt_packages): mysql_pref_file.write(mysql_pref) WORepo.add(self, repo_url=WOVar.wo_mysql_repo) WORepo.add_key(self, '0xcbcb082a1bb943db', - keyserver='keys.gnupg.net') + keyserver='keyserver.ubuntu.com') WORepo.add_key(self, '0xF1656F24C74CD1D8', - keyserver='keys.gnupg.net') + keyserver='keyserver.ubuntu.com') if "mariadb-server" in apt_packages: # generate random 24 characters root password chars = ''.join(random.sample(string.ascii_letters, 24))