|
|
@@ -230,7 +230,7 @@ if __name__ == '__main__':
|
|
|
logging.info('Asking certificates for webmail')
|
|
|
vhost_name = config['webmail']['vhost'].strip()
|
|
|
webmails_list = ["webmail.{}".format(d.strip()) for d in config['webmail']['domains'].split(',') if len(d.strip())>0]
|
|
|
- logging.info('vhost {}, domains_list {}'.format(vhost_name, webmails_list)
|
|
|
+ logging.info('vhost {}, domains_list {}'.format(vhost_name, webmails_list))
|
|
|
if acme_request(config, vhost_name, acme_test='HTTP-01', dryrun=dryrun, domains_list=webmails_list):
|
|
|
link_cert(config, vhost_name, vhost_name, dryrun=dryrun)
|
|
|
else:
|
|
|
@@ -246,7 +246,7 @@ if __name__ == '__main__':
|
|
|
alias_list = get_alias_list(config, dns_conn, mbox_query, server_addresses)
|
|
|
# Per usi futuri, aggiungo l'alias 'mail.indivia.net'
|
|
|
alias_list.append('mail.indivia.net')
|
|
|
- logging.info('vhost {}, domains_list {}'.format(vhost_name, alias_list)
|
|
|
+ logging.info('vhost {}, domains_list {}'.format(vhost_name, alias_list))
|
|
|
if acme_request(config, vhost_name, acme_test='HTTP-01', webroot=config['mail']['mbox_webroot'].strip(),
|
|
|
dryrun=dryrun, domains_list=alias_list):
|
|
|
# non e' richiesto il link, punto direttamente le configurazioni alle dir di letsencrypt
|
|
|
@@ -263,7 +263,7 @@ if __name__ == '__main__':
|
|
|
smtp_fmt = ','.join(['%s'] * len(server_addresses))
|
|
|
smtp_query = smtp_list_stmt.format(smtp_fmt)
|
|
|
alias_list = get_alias_list(config, dns_conn, smtp_query, server_addresses)
|
|
|
- logging.info('vhost {}, domains_list {}'.format(vhost_name, alias_list)
|
|
|
+ logging.info('vhost {}, domains_list {}'.format(vhost_name, alias_list))
|
|
|
if acme_request(config, vhost_name, acme_test='HTTP-01', webroot=config['mail']['smtp_webroot'].strip(),
|
|
|
dryrun=dryrun, domains_list=alias_list):
|
|
|
# non e' richiesto il link, punto direttamente le configurazioni alle dir di letsencrypt
|
