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

Misc fixes after testing

Browse source
This commit is contained in:
Alexandre Aubin 2021-02-26 00:20:39 +01:00
parent 071732dd7f
commit 64a1b4cad2
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/control vendored
View file

@ -27,7 +27,7 @@ Depends: ${python3:Depends}, ${misc:Depends}
, redis-server , redis-server
, metronome (>=3.14.0) , metronome (>=3.14.0)
, acl , acl
, git, curl, wget, cron, unzip, jq, bc , git, curl, wget, cron, unzip, jq, bc, at
, lsb-release, haveged, fake-hwclock, equivs, lsof, whois , lsb-release, haveged, fake-hwclock, equivs, lsof, whois
Recommends: yunohost-admin Recommends: yunohost-admin
, ntp, inetutils-ping | iputils-ping , ntp, inetutils-ping | iputils-ping

11
src/yunohost/dyndns.py
View file

@ -123,7 +123,7 @@ def dyndns_subscribe(
""" """
if _guess_current_dyndns_domain(dyn_host) != (None, None): if _guess_current_dyndns_domain(subscribe_host) != (None, None):
raise YunohostError('domain_dyndns_already_subscribed') raise YunohostError('domain_dyndns_already_subscribed')
if domain is None: if domain is None:
@ -169,7 +169,7 @@ def dyndns_subscribe(
try: try:
r = requests.post( r = requests.post(
"https://%s/key/%s?key_algo=hmac-sha512" "https://%s/key/%s?key_algo=hmac-sha512"
% (subscribe_host, base64.b64encode(key)), % (subscribe_host, base64.b64encode(key.encode()).decode()),
data={"subdomain": domain}, data={"subdomain": domain},
timeout=30, timeout=30,
) )
@ -188,13 +188,14 @@ def dyndns_subscribe(
# Yunohost regen conf will add the dyndns cron job if a private key exists # Yunohost regen conf will add the dyndns cron job if a private key exists
# in /etc/yunohost/dyndns # in /etc/yunohost/dyndns
regen_conf("yunohost") regen_conf(["yunohost"])
# Add some dyndns update in 2 and 4 minutes from now such that user should # Add some dyndns update in 2 and 4 minutes from now such that user should
# not have to wait 10ish minutes for the conf to propagate # not have to wait 10ish minutes for the conf to propagate
cmd = "at -M now + {t} >/dev/null 2>&1 <<< \"/bin/bash -c 'yunohost dyndns update'\"" cmd = "at -M now + {t} >/dev/null 2>&1 <<< \"/bin/bash -c 'yunohost dyndns update'\""
subprocess.check_call(cmd.format(t="2 min"), shell=True) # For some reason subprocess doesn't like the redirections so we have to use bash -c explicity...
subprocess.check_call(cmd.format(t="4 min"), shell=True) subprocess.check_call(["bash", "-c", cmd.format(t="2 min")])
subprocess.check_call(["bash", "-c", cmd.format(t="4 min")])
logger.success(m18n.n('dyndns_registered')) logger.success(m18n.n('dyndns_registered'))