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

Return main domain if no domain is provide (closes #91)

Browse source
This commit is contained in:
Kload 2014-03-03 13:18:46 +01:00
parent 3cafe1dda0
commit 365b84ee69
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
yunohost_tools.py
View file

@ -99,7 +99,7 @@ def tools_adminpw(old_password, new_password):
raise YunoHostError(22, _("Invalid password")) raise YunoHostError(22, _("Invalid password"))
def tools_maindomain(old_domain, new_domain, dyndns=False): def tools_maindomain(old_domain=None, new_domain=None, dyndns=False):
""" """
Main domain change tool Main domain change tool
@ -113,6 +113,9 @@ def tools_maindomain(old_domain, new_domain, dyndns=False):
with open('/etc/yunohost/current_host', 'r') as f: with open('/etc/yunohost/current_host', 'r') as f:
old_domain = f.readline().rstrip() old_domain = f.readline().rstrip()
if not new_domain:
return { 'Current main domain': old_domain }
validate(r'^([a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)(\.[a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)*(\.[a-zA-Z]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)$', old_domain) validate(r'^([a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)(\.[a-zA-Z0-9]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)*(\.[a-zA-Z]{1}([a-zA-Z0-9\-]*[a-zA-Z0-9])*)$', old_domain)
config_files = [ config_files = [