Bob Mottram 10 лет назад
Родитель
Сommit
400b79b894
1 измененных файлов: 3 добавлений и 4 удалений
  1. 3
    4
      src/freedombone

+ 3
- 4
src/freedombone Просмотреть файл

110
 SSH_PORT=2222
110
 SSH_PORT=2222
111
 
111
 
112
 # parameters used when adding a new domain
112
 # parameters used when adding a new domain
113
-DDNS_PROVIDER="freedns.afraid.org"
113
+DDNS_PROVIDER="default@freedns.afraid.org"
114
 DDNS_USERNAME=
114
 DDNS_USERNAME=
115
 DDNS_PASSWORD=
115
 DDNS_PASSWORD=
116
 CURRENT_DDNS_DOMAIN=
116
 CURRENT_DDNS_DOMAIN=
1140
       echo 'Please provide the password for your dynamic DNS provider with the --ddnspass option'
1140
       echo 'Please provide the password for your dynamic DNS provider with the --ddnspass option'
1141
       exit 6382
1141
       exit 6382
1142
   fi
1142
   fi
1143
-  if [[ $DDNS_PROVIDER == "freedns.afraid.org" ]]; then
1143
+  if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1144
       if [ ! $FREEDNS_SUBDOMAIN_CODE ]; then
1144
       if [ ! $FREEDNS_SUBDOMAIN_CODE ]; then
1145
           show_help
1145
           show_help
1146
           exit 4
1146
           exit 4
1149
   if [ ! $SYSTEM_TYPE ]; then
1149
   if [ ! $SYSTEM_TYPE ]; then
1150
       SYSTEM_TYPE=$VARIANT_FULL
1150
       SYSTEM_TYPE=$VARIANT_FULL
1151
   fi
1151
   fi
1152
-  echo "System: $SYSTEM_TYPE"
1153
   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
1152
   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
1154
       echo "'$SYSTEM_TYPE' is an unrecognised Freedombone variant."
1153
       echo "'$SYSTEM_TYPE' is an unrecognised Freedombone variant."
1155
       exit 30
1154
       exit 30
6215
   fi
6214
   fi
6216
   if ! grep -q "$DDNS_PROVIDER" /etc/inadyn.conf; then
6215
   if ! grep -q "$DDNS_PROVIDER" /etc/inadyn.conf; then
6217
       echo '' >> /etc/inadyn.conf
6216
       echo '' >> /etc/inadyn.conf
6218
-      echo "system default@$DDNS_PROVIDER" >> /etc/inadyn.conf
6217
+      echo "system $DDNS_PROVIDER" >> /etc/inadyn.conf
6219
       echo '  ssl' >> /etc/inadyn.conf
6218
       echo '  ssl' >> /etc/inadyn.conf
6220
       if [ $DDNS_USERNAME ]; then
6219
       if [ $DDNS_USERNAME ]; then
6221
           echo "  username $DDNS_USERNAME" >> /etc/inadyn.conf
6220
           echo "  username $DDNS_USERNAME" >> /etc/inadyn.conf