diff --git a/yunohost_app.py b/yunohost_app.py index 44fb75a2..d63a13e6 100644 --- a/yunohost_app.py +++ b/yunohost_app.py @@ -676,7 +676,7 @@ def app_ssowatconf(): 'Email': 'mail' }, 'domains': domains, - 'skipped_urls': [main_domain +'/ynhadmin'], + 'skipped_urls': [main_domain +'/ynhadmin', main_domain +'/ynhapi'], 'unprotected_urls': [], 'users': users } diff --git a/yunohost_backup.py b/yunohost_backup.py index 0d9bd1f1..2edea6bb 100644 --- a/yunohost_backup.py +++ b/yunohost_backup.py @@ -50,5 +50,6 @@ def backup_init(helper=False): try: with open('/etc/yunohost/light') as f: pass except IOError: - os.system('update-rc.d tahoe-lafs defaults') - os.system('service tahoe-lafs restart') + pass + #os.system('update-rc.d tahoe-lafs defaults') + #os.system('service tahoe-lafs restart') diff --git a/yunohost_dyndns.py b/yunohost_dyndns.py index ce9fb806..e4dcc126 100644 --- a/yunohost_dyndns.py +++ b/yunohost_dyndns.py @@ -146,7 +146,7 @@ def dyndns_installcron(): """ os.system("touch /etc/cron.d/yunohost-dyndns") - os.system("echo '*/30 * * * * root yunohost dyndns update --no-ldap >> /dev/null' >/etc/cron.d/yunohost-dyndns") + os.system("echo '*/2 * * * * root yunohost dyndns update --no-ldap >> /dev/null' >/etc/cron.d/yunohost-dyndns") win_msg(_("DynDNS cron installed")) diff --git a/yunohost_tools.py b/yunohost_tools.py index ab544cd0..b296fb4a 100644 --- a/yunohost_tools.py +++ b/yunohost_tools.py @@ -31,7 +31,6 @@ import getpass import subprocess import requests import json -import time from yunohost import YunoHostError, YunoHostLDAP, validate, colorize, get_required_args, win_msg from yunohost_domain import domain_add, domain_list from yunohost_dyndns import dyndns_subscribe @@ -185,7 +184,7 @@ def tools_maindomain(old_domain, new_domain, dyndns=False): with open('/etc/yunohost/light') as f: pass except IOError: command_list.append('service amavis restart') - command_list.append('service tahoe-lafs restart') + #command_list.append('service tahoe-lafs restart') for command in command_list: if os.system(command) != 0: @@ -198,8 +197,6 @@ def tools_maindomain(old_domain, new_domain, dyndns=False): dyndomain = '.'.join(new_domain.split('.')[1:]) if dyndomain in dyndomains: dyndns_subscribe(domain=new_domain) - time.sleep(120) - os.system('yunohost dyndns update') win_msg(_("Main domain has been successfully changed"))