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] pep8

Browse source
This commit is contained in:
Laurent Peuch 2016-10-30 04:29:16 +01:00
parent 6a1727da89
commit ef62877952
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/yunohost/domain.py
View file

@ -30,14 +30,16 @@ import json
import yaml import yaml
import errno import errno
import requests import requests
from urllib import urlopen from urllib import urlopen
from moulinette.core import MoulinetteError from moulinette.core import MoulinetteError
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
from yunohost.service import service_regen_conf
import yunohost.certificate import yunohost.certificate
from yunohost.service import service_regen_conf
logger = getActionLogger('yunohost.domain') logger = getActionLogger('yunohost.domain')
@ -115,7 +117,7 @@ def domain_add(auth, domain, dyndns=False):
yunohost.certificate.certificate_install_selfsigned([domain], False) yunohost.certificate.certificate_install_selfsigned([domain], False)
try: try:
auth.validate_uniqueness({ 'virtualdomain': domain }) auth.validate_uniqueness({'virtualdomain': domain})
except MoulinetteError: except MoulinetteError:
raise MoulinetteError(errno.EEXIST, m18n.n('domain_exists')) raise MoulinetteError(errno.EEXIST, m18n.n('domain_exists'))
@ -254,15 +256,19 @@ def domain_dns_conf(domain, ttl=None):
return result return result
def domain_cert_status(auth, domainList, full=False): def domain_cert_status(auth, domainList, full=False):
return yunohost.certificate.certificate_status(auth, domainList, full) return yunohost.certificate.certificate_status(auth, domainList, full)
def domain_cert_install(auth, domainList, force=False, no_checks=False, self_signed=False): def domain_cert_install(auth, domainList, force=False, no_checks=False, self_signed=False):
return yunohost.certificate.certificate_install(auth, domainList, force, no_checks, self_signed) return yunohost.certificate.certificate_install(auth, domainList, force, no_checks, self_signed)
def domain_cert_renew(auth, domainList, force=False, no_checks=False, email=False): def domain_cert_renew(auth, domainList, force=False, no_checks=False, email=False):
return yunohost.certificate.certificate_renew(auth, domainList, force, no_checks, email) return yunohost.certificate.certificate_renew(auth, domainList, force, no_checks, email)
def get_public_ip(protocol=4): def get_public_ip(protocol=4):
"""Retrieve the public IP address from ip.yunohost.org""" """Retrieve the public IP address from ip.yunohost.org"""
if protocol == 4: if protocol == 4:
@ -278,4 +284,3 @@ def get_public_ip(protocol=4):
logger.debug('cannot retrieve public IPv%d' % protocol, exc_info=1) logger.debug('cannot retrieve public IPv%d' % protocol, exc_info=1)
raise MoulinetteError(errno.ENETUNREACH, raise MoulinetteError(errno.ENETUNREACH,
m18n.n('no_internet_connection')) m18n.n('no_internet_connection'))