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

Fixing a few stuff after tests..

Browse source
This commit is contained in:
Alexandre Aubin 2018-01-06 21:42:47 +01:00
parent 7e02e355d5
commit 6bf80877af
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/yunohost/data_migrations/0002_migrate_to_tsig_sha256.py
View file

@ -3,6 +3,7 @@ import os
import requests import requests
import base64 import base64
import time import time
import json
from moulinette import m18n from moulinette import m18n
from moulinette.core import MoulinetteError from moulinette.core import MoulinetteError
@ -21,14 +22,13 @@ class MyMigration(Migration):
# Not possible because that's a non-reversible operation ? # Not possible because that's a non-reversible operation ?
pass pass
def migrate(self, dyn_host="dyndns.yunohost.org", domain=None, private_key_path=None):
def forward(self, dyn_host="dyndns.yunohost.org", domain=None, private_key_path=None): if domain is None or private_key_path is None:
if domain in None or private_key_path is None:
try: try:
(domain, private_key_path) = _guess_current_dyndns_domain(dyn_host) (domain, private_key_path) = _guess_current_dyndns_domain(dyn_host)
assert "+157" in private_key_path #assert "+157" in private_key_path
except MoulinetteError: except (MoulinetteError, AssertionError):
logger.warning("migrate_tsig_not_needed") logger.warning("migrate_tsig_not_needed")
return return
@ -56,18 +56,21 @@ class MyMigration(Migration):
if r.status_code != 201: if r.status_code != 201:
try: try:
error = json.loads(r.text)['error'] error = json.loads(r.text)['error']
show_traceback = 0
except Exception: except Exception:
# failed to decode json # failed to decode json
error = r.text error = r.text
show_traceback = 1
logger.warning(m18n.n('migrate_tsig_failed', domain=domain, import traceback
error_code=str(r.status_code), error=error), from StringIO import StringIO
exc_info=show_traceback) stack = StringIO()
traceback.print_exc(file=stack)
logger.error(stack.getvalue())
# Migration didn't succeed, so we rollback and raise an exception
os.system("mv /etc/yunohost/dyndns/*+165* /tmp") os.system("mv /etc/yunohost/dyndns/*+165* /tmp")
return public_key_path
raise MoulinetteError(m18n.n('migrate_tsig_failed', domain=domain,
error_code=str(r.status_code), error=error))
# remove old certificates # remove old certificates
os.system("mv /etc/yunohost/dyndns/*+157* /tmp") os.system("mv /etc/yunohost/dyndns/*+157* /tmp")
@ -83,6 +86,5 @@ class MyMigration(Migration):
time.sleep(30) time.sleep(30)
logger.warning(m18n.n('migrate_tsig_end')) logger.warning(m18n.n('migrate_tsig_end'))
return new_key_path.rsplit(".key", 1)[0] + ".private" return