diff --git a/wo/core/acme.py b/wo/core/acme.py index 39733ef..9f7a7fe 100644 --- a/wo/core/acme.py +++ b/wo/core/acme.py @@ -154,7 +154,7 @@ class WOAcme: domain=wo_domain_name, quic=False) WOTemplate.deploy(self, '/var/www/22222/conf/nginx/ssl.conf', - 'ssl.mustache', data, overwrite=False) + 'ssl.mustache', data, overwrite=True) WOGit.add(self, ["/etc/letsencrypt"], msg="Adding letsencrypt folder") diff --git a/wo/core/download.py b/wo/core/download.py index 81c9738..0c05b61 100644 --- a/wo/core/download.py +++ b/wo/core/download.py @@ -21,18 +21,17 @@ class WODownload(): directory = os.path.dirname(filename) if not os.path.exists(directory): os.makedirs(directory) - Log.info(self, "Downloading {0:20}".format(pkg_name), end=' ') + Log.wait(self, "Downloading {0:20}".format(pkg_name)) with open(filename, "wb") as out_file: req = requests.get(url, timeout=(5, 30)) if req.encoding is None: req.encoding = 'utf-8' out_file.write(req.content) - Log.info(self, "{0}".format("[" + Log.ENDC + "Done" + - Log.OKBLUE + "]")) + Log.valide(self, "Downloading {0:20}".format(pkg_name)) except requests.RequestException as e: Log.debug(self, "[{err}]".format(err=str(e.reason))) Log.error(self, "Unable to download file, {0}" - .format(filename)) + .format(filename), exit=False) return False return 0