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

Small tweaks for the web interface

Browse source
This commit is contained in:
Alexandre Aubin 2016-11-20 20:36:58 -05:00
parent 11c626881a
commit bba92e4d41
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/actionsmap/yunohost.yml
View file

@ -308,7 +308,7 @@ domain:
### certificate_status() ### certificate_status()
cert-status: cert-status:
action_help: List status of current certificates (all by default). action_help: List status of current certificates (all by default).
api: GET /certs/status/<domains> api: GET /domains/cert-status/<domain_list>
configuration: configuration:
authenticate: all authenticate: all
authenticator: ldap-anonymous authenticator: ldap-anonymous
@ -323,7 +323,7 @@ domain:
### certificate_install() ### certificate_install()
cert-install: cert-install:
action_help: Install Let's Encrypt certificates for given domains (all by default). action_help: Install Let's Encrypt certificates for given domains (all by default).
api: POST /certs/enable/<domains> api: POST /domains/cert-install/<domain_list>
configuration: configuration:
authenticate: all authenticate: all
authenticator: ldap-anonymous authenticator: ldap-anonymous
@ -344,7 +344,7 @@ domain:
### certificate_renew() ### certificate_renew()
cert-renew: cert-renew:
action_help: Renew the Let's Encrypt certificates for given domains (all by default). action_help: Renew the Let's Encrypt certificates for given domains (all by default).
api: POST /certs/renew/<domains> api: POST /domains/cert-renew/<domain_list>
configuration: configuration:
authenticate: all authenticate: all
authenticator: ldap-anonymous authenticator: ldap-anonymous

14
src/yunohost/certificate.py
View file

@ -103,6 +103,7 @@ def certificate_status(auth, domain_list, full=False):
if not full: if not full:
del status["subject"] del status["subject"]
del status["CA_name"] del status["CA_name"]
del status["ACME_eligible"]
status["CA_type"] = status["CA_type"]["verbose"] status["CA_type"] = status["CA_type"]["verbose"]
status["summary"] = status["summary"]["verbose"] status["summary"] = status["summary"]["verbose"]
@ -249,7 +250,7 @@ def certificate_install_letsencrypt(auth, domain_list, force=False, no_checks=Fa
try: try:
if not no_checks: if not no_checks:
_check_domain_is_correctly_configured(domain) _check_domain_is_ready_for_ACME(domain)
_configure_for_acme_challenge(auth, domain) _configure_for_acme_challenge(auth, domain)
_fetch_and_enable_new_certificate(domain) _fetch_and_enable_new_certificate(domain)
@ -318,7 +319,7 @@ def certificate_renew(auth, domain_list, force=False, no_checks=False, email=Fal
try: try:
if not no_checks: if not no_checks:
_check_domain_is_correctly_configured(domain) _check_domain_is_ready_for_ACME(domain)
_fetch_and_enable_new_certificate(domain) _fetch_and_enable_new_certificate(domain)
logger.success(m18n.n("certmanager_cert_renew_success", domain=domain)) logger.success(m18n.n("certmanager_cert_renew_success", domain=domain))
@ -608,6 +609,12 @@ def _get_status(domain):
"verbose": "Unknown?", "verbose": "Unknown?",
} }
try :
_check_domain_is_ready_for_ACME(domain)
ACME_eligible = True
except :
ACME_eligible = False
return { return {
"domain": domain, "domain": domain,
"subject": cert_subject, "subject": cert_subject,
@ -615,6 +622,7 @@ def _get_status(domain):
"CA_type": CA_type, "CA_type": CA_type,
"validity": days_remaining, "validity": days_remaining,
"summary": status_summary, "summary": status_summary,
"ACME_eligible": ACME_eligible
} }
############################################################################### ###############################################################################
@ -681,7 +689,7 @@ def _backup_current_cert(domain):
shutil.copytree(cert_folder_domain, backup_folder) shutil.copytree(cert_folder_domain, backup_folder)
def _check_domain_is_correctly_configured(domain): def _check_domain_is_ready_for_ACME(domain):
public_ip = yunohost.domain.get_public_ip() public_ip = yunohost.domain.get_public_ip()
# Check if IP from DNS matches public IP # Check if IP from DNS matches public IP