Fix ddns provider

This commit is contained in:
Bob Mottram 2015-01-18 21:47:43 +00:00
parent 862c77a214
commit 400b79b894
1 changed files with 3 additions and 4 deletions

View File

@ -110,7 +110,7 @@ CONFIGURATION_FILE="freedombone.cfg"
SSH_PORT=2222 SSH_PORT=2222
# parameters used when adding a new domain # parameters used when adding a new domain
DDNS_PROVIDER="freedns.afraid.org" DDNS_PROVIDER="default@freedns.afraid.org"
DDNS_USERNAME= DDNS_USERNAME=
DDNS_PASSWORD= DDNS_PASSWORD=
CURRENT_DDNS_DOMAIN= CURRENT_DDNS_DOMAIN=
@ -1140,7 +1140,7 @@ function parse_args {
echo 'Please provide the password for your dynamic DNS provider with the --ddnspass option' echo 'Please provide the password for your dynamic DNS provider with the --ddnspass option'
exit 6382 exit 6382
fi fi
if [[ $DDNS_PROVIDER == "freedns.afraid.org" ]]; then if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
if [ ! $FREEDNS_SUBDOMAIN_CODE ]; then if [ ! $FREEDNS_SUBDOMAIN_CODE ]; then
show_help show_help
exit 4 exit 4
@ -1149,7 +1149,6 @@ function parse_args {
if [ ! $SYSTEM_TYPE ]; then if [ ! $SYSTEM_TYPE ]; then
SYSTEM_TYPE=$VARIANT_FULL SYSTEM_TYPE=$VARIANT_FULL
fi fi
echo "System: $SYSTEM_TYPE"
if [[ $SYSTEM_TYPE != $VARIANT_WRITER && $SYSTEM_TYPE != $VARIANT_CLOUD && $SYSTEM_TYPE != $VARIANT_CHAT && $SYSTEM_TYPE != $VARIANT_MAILBOX && $SYSTEM_TYPE != $VARIANT_NONMAILBOX && $SYSTEM_TYPE != $VARIANT_SOCIAL && $SYSTEM_TYPE != $VARIANT_MEDIA && $SYSTEM_TYPE != $VARIANT_TOR_DONGLE && $SYSTEM_TYPE != $VARIANT_FULL ]]; then if [[ $SYSTEM_TYPE != $VARIANT_WRITER && $SYSTEM_TYPE != $VARIANT_CLOUD && $SYSTEM_TYPE != $VARIANT_CHAT && $SYSTEM_TYPE != $VARIANT_MAILBOX && $SYSTEM_TYPE != $VARIANT_NONMAILBOX && $SYSTEM_TYPE != $VARIANT_SOCIAL && $SYSTEM_TYPE != $VARIANT_MEDIA && $SYSTEM_TYPE != $VARIANT_TOR_DONGLE && $SYSTEM_TYPE != $VARIANT_FULL ]]; then
echo "'$SYSTEM_TYPE' is an unrecognised Freedombone variant." echo "'$SYSTEM_TYPE' is an unrecognised Freedombone variant."
exit 30 exit 30
@ -6215,7 +6214,7 @@ function add_ddns_domain {
fi fi
if ! grep -q "$DDNS_PROVIDER" /etc/inadyn.conf; then if ! grep -q "$DDNS_PROVIDER" /etc/inadyn.conf; then
echo '' >> /etc/inadyn.conf echo '' >> /etc/inadyn.conf
echo "system default@$DDNS_PROVIDER" >> /etc/inadyn.conf echo "system $DDNS_PROVIDER" >> /etc/inadyn.conf
echo ' ssl' >> /etc/inadyn.conf echo ' ssl' >> /etc/inadyn.conf
if [ $DDNS_USERNAME ]; then if [ $DDNS_USERNAME ]; then
echo " username $DDNS_USERNAME" >> /etc/inadyn.conf echo " username $DDNS_USERNAME" >> /etc/inadyn.conf