YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[mod] more pythonic string concatenation

Browse source
This commit is contained in:
Laurent Peuch 2016-10-30 05:29:10 +01:00
parent dd893b0838
commit 34f9890517
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/yunohost/certificate.py
View file

@ -359,15 +359,15 @@ def _configure_for_acme_challenge(auth, domain):
location '/.well-known/acme-challenge' location '/.well-known/acme-challenge'
{ {
default_type "text/plain"; default_type "text/plain";
alias ''' + webroot_folder + '''; alias %s;
} }
''' ''' % webroot_folder
# Write the conf # Write the conf
if os.path.exists(nginx_conf_file): if os.path.exists(nginx_conf_file):
logger.info("Nginx configuration file for ACME challenge already exists for domain, skipping.") logger.info("Nginx configuration file for ACME challenge already exists for domain, skipping.")
else: else:
logger.info("Adding Nginx configuration file for Acme challenge for domain " + domain + ".") logger.info("Adding Nginx configuration file for Acme challenge for domain %s.", domain)
with open(nginx_conf_file, "w") as f: with open(nginx_conf_file, "w") as f:
f.write(nginx_configuration) f.write(nginx_configuration)
@ -394,7 +394,7 @@ def _fetch_and_enable_new_certificate(domain):
_set_permissions(tmp_folder, "root", "root", 0640) _set_permissions(tmp_folder, "root", "root", 0640)
# Prepare certificate signing request # Prepare certificate signing request
logger.info("Prepare key and certificate signing request (CSR) for " + domain + "...") logger.info("Prepare key and certificate signing request (CSR) for %s...", domain)
domain_key_file = "%s/%s.pem" % (tmp_folder, domain) domain_key_file = "%s/%s.pem" % (tmp_folder, domain)
_generate_key(domain_key_file) _generate_key(domain_key_file)