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

Update and review yunohost.dyndns

Browse source
This commit is contained in:
Jerome Lebleu 2014-03-30 19:28:30 +02:00
parent 23e3ef28be
commit 0565be543a
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/yunohost/dyndns.py
View file

@ -23,9 +23,6 @@
Subscribe and Update DynDNS Hosts Subscribe and Update DynDNS Hosts
""" """
import logging
logging.warning('the module yunohost.dyndns has not been revisited and updated yet')
import os import os
import sys import sys
import requests import requests
@ -33,7 +30,8 @@ import json
import glob import glob
import base64 import base64
from moulinette.helpers import YunoHostError, YunoHostLDAP, validate, colorize, win_msg from moulinette.core import MoulinetteError
def dyndns_subscribe(subscribe_host="dyndns.yunohost.org", domain=None, key=None): def dyndns_subscribe(subscribe_host="dyndns.yunohost.org", domain=None, key=None):
""" """
@ -51,7 +49,7 @@ def dyndns_subscribe(subscribe_host="dyndns.yunohost.org", domain=None, key=None
# Verify if domain is available # Verify if domain is available
if requests.get('http://'+ subscribe_host +'/test/'+ domain).status_code != 200: if requests.get('http://'+ subscribe_host +'/test/'+ domain).status_code != 200:
raise YunoHostError(17, _("DynDNS domain is already taken")) raise MoulinetteError(17, _("DynDNS domain is already taken"))
if key is None: if key is None:
if len(glob.glob('/etc/yunohost/dyndns/*.key')) == 0: if len(glob.glob('/etc/yunohost/dyndns/*.key')) == 0:
@ -69,9 +67,9 @@ def dyndns_subscribe(subscribe_host="dyndns.yunohost.org", domain=None, key=None
if r.status_code != 201: if r.status_code != 201:
try: error = json.loads(r.text)['error'] try: error = json.loads(r.text)['error']
except: error = "Server error" except: error = "Server error"
raise YunoHostError(1, _("An error occured during DynDNS registration: "+ error)) raise MoulinetteError(1, _("An error occurred during DynDNS registration: %s") % error)
win_msg(_("Subscribed to DynDNS")) msignals.display(_("Subscribed to DynDNS."), 'success')
dyndns_installcron() dyndns_installcron()
@ -136,12 +134,12 @@ def dyndns_update(dyn_host="dynhost.yunohost.org", domain=None, key=None, ip=Non
else: else:
private_key_file = key private_key_file = key
if os.system('/usr/bin/nsupdate -k '+ private_key_file +' /etc/yunohost/dyndns/zone') == 0: if os.system('/usr/bin/nsupdate -k '+ private_key_file +' /etc/yunohost/dyndns/zone') == 0:
win_msg(_("IP successfully updated")) msignals.display(_("IP successfully updated."), 'success')
with open('/etc/yunohost/dyndns/old_ip', 'w') as f: with open('/etc/yunohost/dyndns/old_ip', 'w') as f:
f.write(new_ip) f.write(new_ip)
else: else:
os.system('rm /etc/yunohost/dyndns/old_ip > /dev/null 2>&1') os.system('rm /etc/yunohost/dyndns/old_ip > /dev/null 2>&1')
raise YunoHostError(1, _("An error occured during DynDNS update")) raise MoulinetteError(1, _("An error occurred during DynDNS update"))
def dyndns_installcron(): def dyndns_installcron():
@ -152,7 +150,7 @@ def dyndns_installcron():
""" """
os.system("touch /etc/cron.d/yunohost-dyndns") os.system("touch /etc/cron.d/yunohost-dyndns")
os.system("echo '*/2 * * * * 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")) msignals.display(_("DynDNS cron installed."), 'success')
def dyndns_removecron(): def dyndns_removecron():
@ -164,6 +162,6 @@ def dyndns_removecron():
try: try:
os.remove("/etc/cron.d/yunohost-dyndns") os.remove("/etc/cron.d/yunohost-dyndns")
except: except:
raise YunoHostError(167,_("DynDNS cron was not installed!")) raise MoulinetteError(167,_("DynDNS cron was not installed"))
win_msg(_("DynDNS cron removed")) msignals.display(_("DynDNS cron removed."), 'success')