mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
[mod] style
This commit is contained in:
parent
4a9b89d12e
commit
f0c29147dd
1 changed files with 5 additions and 0 deletions
|
@ -201,7 +201,9 @@ def _certificate_install_selfsigned(domain_list, force=False):
|
||||||
for command in commands:
|
for command in commands:
|
||||||
p = subprocess.Popen(
|
p = subprocess.Popen(
|
||||||
command.split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
command.split(), stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||||
|
|
||||||
out, _ = p.communicate()
|
out, _ = p.communicate()
|
||||||
|
|
||||||
if p.returncode != 0:
|
if p.returncode != 0:
|
||||||
logger.warning(out)
|
logger.warning(out)
|
||||||
raise MoulinetteError(
|
raise MoulinetteError(
|
||||||
|
@ -532,8 +534,10 @@ def _fetch_and_enable_new_certificate(domain, staging=False):
|
||||||
logger.error(str(e))
|
logger.error(str(e))
|
||||||
raise MoulinetteError(errno.EINVAL, m18n.n(
|
raise MoulinetteError(errno.EINVAL, m18n.n(
|
||||||
'certmanager_cert_signing_failed'))
|
'certmanager_cert_signing_failed'))
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(str(e))
|
logger.error(str(e))
|
||||||
|
|
||||||
raise MoulinetteError(errno.EINVAL, m18n.n(
|
raise MoulinetteError(errno.EINVAL, m18n.n(
|
||||||
'certmanager_cert_signing_failed'))
|
'certmanager_cert_signing_failed'))
|
||||||
|
|
||||||
|
@ -552,6 +556,7 @@ def _fetch_and_enable_new_certificate(domain, staging=False):
|
||||||
|
|
||||||
new_cert_folder = "%s/%s-history/%s-%s" % (
|
new_cert_folder = "%s/%s-history/%s-%s" % (
|
||||||
CERT_FOLDER, domain, date_tag, folder_flag)
|
CERT_FOLDER, domain, date_tag, folder_flag)
|
||||||
|
|
||||||
os.makedirs(new_cert_folder)
|
os.makedirs(new_cert_folder)
|
||||||
|
|
||||||
_set_permissions(new_cert_folder, "root", "root", 0655)
|
_set_permissions(new_cert_folder, "root", "root", 0655)
|
||||||
|
|
Loading…
Add table
Reference in a new issue