diff --git a/setup.py b/setup.py index 14a12e6..dff04ab 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ setup(name='wo', classifiers=[], keywords='', author='WordOps', - author_email='core@wordops.net', + author_email='contact@wordops.io', url='https://wordops.net', license='MIT', packages=find_packages(exclude=['ez_setup', 'examples', 'tests', @@ -85,6 +85,7 @@ setup(name='wo', 'psutil == 3.1.1', 'sh', 'SQLAlchemy', + 'requests == 2.22.0', ], data_files=[('/etc/wo', ['config/wo.conf']), ('/etc/wo/plugins.d', conf), diff --git a/wo/cli/plugins/stack_migrate.py b/wo/cli/plugins/stack_migrate.py index a81d2b4..c1a84c6 100644 --- a/wo/cli/plugins/stack_migrate.py +++ b/wo/cli/plugins/stack_migrate.py @@ -79,10 +79,6 @@ class WOStackMigrateController(CementBaseController): # Install MariaDB apt_packages = WOVariables.wo_mysql - # If PHP is installed then install php7.2-mysql - if WOAptGet.is_installed(self, "php7.2-fpm"): - apt_packages = apt_packages + ["php7.2-mysql"] - Log.info(self, "Updating apt-cache, hang on...") WOAptGet.update(self) Log.info(self, "Installing MariaDB, hang on...") diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 23d652a..c4f3863 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -412,7 +412,7 @@ def post_pref(self, apt_packages, packages): out=wo_nginx) wo_nginx.close() - randompass = ''.join([random.choice + passwd = ''.join([random.choice (string.ascii_letters + string.digits) for n in range(24)]) try: @@ -421,7 +421,7 @@ def post_pref(self, apt_packages, packages): "{password} 2> /dev/null)\n\"" "> /etc/nginx/htpasswd-wo " "2>/dev/null" - .format(password=randompass)) + .format(password=passwd)) except CommandExecutionError as e: Log.debug(self, "{0}".format(e)) Log.error(self, "Failed to save HTTP Auth")