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

yunohost domain add auto-detect DynDNS domains

Browse source 
and asks for a --subscribe or --no-subscribe option
This commit is contained in:
theo@manjaro 2022-07-05 14:37:14 +02:00
parent e4c631c171
commit 986b42fc1d
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
share/actionsmap.yml
View file

@ -453,15 +453,16 @@ domain:
help: Domain name to add help: Domain name to add
extra: extra:
pattern: *pattern_domain pattern: *pattern_domain
-d: -n:
full: --dyndns full: --no-subscribe
help: (Deprecated, using the -p option in order to set a password is recommended) Subscribe to the DynDNS service help: If adding a DynDNS domain, only add the domain, without subscribing to the DynDNS service
action: store_true action: store_true
-p: -s:
full: --password full: --subscribe
metavar: PASSWORD
nargs: "?" nargs: "?"
const: 0 const: 0
help: Subscribe to the DynDNS service with a password, used to later delete the domain help: If adding a DynDNS domain, subscribe to the DynDNS service with a password, used to later delete the domain
extra: extra:
pattern: *pattern_password pattern: *pattern_password
comment: dyndns_added_password comment: dyndns_added_password

18
src/domain.py
View file

@ -40,6 +40,7 @@ from yunohost.app import (
from yunohost.regenconf import regen_conf, _force_clear_hashes, _process_regen_conf from yunohost.regenconf import regen_conf, _force_clear_hashes, _process_regen_conf
from yunohost.utils.config import ConfigPanel, Question from yunohost.utils.config import ConfigPanel, Question
from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.utils.error import YunohostError, YunohostValidationError
from yunohost.utils.dns import is_yunohost_dyndns_domain
from yunohost.log import is_unit_operation from yunohost.log import is_unit_operation
logger = getActionLogger("yunohost.domain") logger = getActionLogger("yunohost.domain")
@ -131,7 +132,7 @@ def _get_parent_domain_of(domain):
@is_unit_operation() @is_unit_operation()
def domain_add(operation_logger, domain, dyndns=False,password=None): def domain_add(operation_logger, domain, subscribe=None, no_subscribe=False):
""" """
Create a custom domain Create a custom domain
@ -163,10 +164,12 @@ def domain_add(operation_logger, domain, dyndns=False,password=None):
domain = domain.encode("idna").decode("utf-8") domain = domain.encode("idna").decode("utf-8")
# DynDNS domain # DynDNS domain
dyndns = dyndns or (password!=None) # If a password is specified, then it is obviously a dyndns domain, no need for the extra option dyndns = is_yunohost_dyndns_domain(domain)
if dyndns: if dyndns:
print(subscribe,no_subscribe)
if ((subscribe==None) == (no_subscribe==False)):
raise YunohostValidationError("domain_dyndns_instruction_unclear")
from yunohost.utils.dns import is_yunohost_dyndns_domain
from yunohost.dyndns import _guess_current_dyndns_domain from yunohost.dyndns import _guess_current_dyndns_domain
# Do not allow to subscribe to multiple dyndns domains... # Do not allow to subscribe to multiple dyndns domains...
@ -178,11 +181,14 @@ def domain_add(operation_logger, domain, dyndns=False,password=None):
if not is_yunohost_dyndns_domain(domain): if not is_yunohost_dyndns_domain(domain):
raise YunohostValidationError("domain_dyndns_root_unknown") raise YunohostValidationError("domain_dyndns_root_unknown")
operation_logger.start()
if dyndns: operation_logger.start()
if not dyndns and (subscribe is not None or no_subscribe):
logger.warning("This domain is not a DynDNS one, no need for the --subscribe or --no-subscribe option")
if dyndns and not no_subscribe:
# Actually subscribe # Actually subscribe
domain_dyndns_subscribe(domain=domain,password=password) domain_dyndns_subscribe(domain=domain,password=subscribe)
_certificate_install_selfsigned([domain], True) _certificate_install_selfsigned([domain], True)