소스 검색

Option to select no dynamic dns provider

Bob Mottram 8 년 전
부모
커밋
c49b94f9ff
1개의 변경된 파일60개의 추가작업 그리고 51개의 파일을 삭제
  1. 60
    51
      src/freedombone-config

+ 60
- 51
src/freedombone-config 파일 보기

@@ -253,7 +253,7 @@ function choose_dynamic_dns {
253 253
         data=$(tempfile 2>/dev/null)
254 254
         trap "rm -f $data" 0 1 2 5 15
255 255
         dialog --backtitle $"Freedombone Configuration" \
256
-               --radiolist $"Choose Dynamic DNS provider:" 15 40 14 \
256
+               --radiolist $"Choose Dynamic DNS provider:" 16 40 15 \
257 257
                1 dyndns off \
258 258
                2 freedns on \
259 259
                3 zoneedit off \
@@ -267,7 +267,8 @@ function choose_dynamic_dns {
267 267
                11 dynsip off \
268 268
                12 sitelutions off \
269 269
                13 dnsexit off \
270
-               14 changeip off 2> $data
270
+               13 changeip off \
271
+               14 none off 2> $data
271 272
         sel=$?
272 273
         case $sel in
273 274
             1) exit 1;;
@@ -288,63 +289,71 @@ function choose_dynamic_dns {
288 289
             12) DDNS_PROVIDER="default@sitelutions.com";;
289 290
             13) DDNS_PROVIDER="default@dnsexit.com";;
290 291
             14) DDNS_PROVIDER="default@changeip.com";;
292
+            15) DDNS_PROVIDER="none";;
291 293
             255) exit 1;;
292 294
         esac
293 295
         save_configuration_values
294 296
 
295 297
         valid_ddns_username=
296
-        while [ ! $valid_ddns_username ]
297
-        do
298
-            data=$(tempfile 2>/dev/null)
299
-            trap "rm -f $data" 0 1 2 5 15
300
-            dialog --backtitle $"Freedombone Configuration" \
301
-                   --inputbox $"Dynamic DNS provider username" 10 30 "$(grep 'DDNS_USERNAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
302
-            sel=$?
303
-            case $sel in
304
-                0)  possible_username=$(cat $data)
305
-                    if [ "$possible_username" ]; then
306
-                        if [ ${#possible_username} -gt 1 ]; then
307
-                            valid_ddns_username=$(cat $data)
308
-                            DDNS_USERNAME=$valid_ddns_username
309
-                            break;
298
+        valid_ddns_password=
299
+        if [[ "$DDNS_PROVIDER" == "none" ]]; then
300
+            if [ -f /etc/systemd/system/inadyn.service ]; then
301
+                systemctl stop inadyn
302
+                systemctl disable inadyn
303
+            fi
304
+        else
305
+            while [ ! $valid_ddns_username ]
306
+            do
307
+                data=$(tempfile 2>/dev/null)
308
+                trap "rm -f $data" 0 1 2 5 15
309
+                dialog --backtitle $"Freedombone Configuration" \
310
+                       --inputbox $"Dynamic DNS provider username" 10 30 "$(grep 'DDNS_USERNAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
311
+                sel=$?
312
+                case $sel in
313
+                    0)  possible_username=$(cat $data)
314
+                        if [ "$possible_username" ]; then
315
+                            if [ ${#possible_username} -gt 1 ]; then
316
+                                valid_ddns_username=$(cat $data)
317
+                                DDNS_USERNAME=$valid_ddns_username
318
+                                break;
319
+                            fi
310 320
                         fi
311
-                    fi
312
-                    ;;
313
-                1) exit 1;;
314
-                255) exit 1;;
315
-            esac
316
-        done
317
-        save_configuration_values
321
+                        ;;
322
+                    1) exit 1;;
323
+                    255) exit 1;;
324
+                esac
325
+            done
326
+            save_configuration_values
318 327
 
319
-        valid_ddns_password=
320
-        while [ ! $valid_ddns_password ]
321
-        do
322
-            data=$(tempfile 2>/dev/null)
323
-            trap "rm -f $data" 0 1 2 5 15
324
-            dialog --backtitle $"Freedombone Configuration" \
325
-                   --clear \
326
-                   --insecure \
327
-                   --passwordbox $"Dynamic DNS provider password" 10 30 "$(grep 'DDNS_PASSWORD' temp.cfg | awk -F '=' '{print $2}')" 2> $data
328
-            sel=$?
329
-            case $sel in
330
-                0)  possible_password=$(cat $data)
331
-                    if [ "$possible_password" ]; then
332
-                        if [ ${#possible_password} -gt 1 ]; then
333
-                            valid_ddns_password=$(cat $data)
334
-                            DDNS_PASSWORD=$valid_ddns_password
335
-                            break;
328
+            while [ ! $valid_ddns_password ]
329
+            do
330
+                data=$(tempfile 2>/dev/null)
331
+                trap "rm -f $data" 0 1 2 5 15
332
+                dialog --backtitle $"Freedombone Configuration" \
333
+                       --clear \
334
+                       --insecure \
335
+                       --passwordbox $"Dynamic DNS provider password" 10 30 "$(grep 'DDNS_PASSWORD' temp.cfg | awk -F '=' '{print $2}')" 2> $data
336
+                sel=$?
337
+                case $sel in
338
+                    0)  possible_password=$(cat $data)
339
+                        if [ "$possible_password" ]; then
340
+                            if [ ${#possible_password} -gt 1 ]; then
341
+                                valid_ddns_password=$(cat $data)
342
+                                DDNS_PASSWORD=$valid_ddns_password
343
+                                break;
344
+                            fi
336 345
                         fi
337
-                    fi
338
-                    ;;
339
-                1) exit 1;;
340
-                255) exit 1;;
341
-            esac
342
-            if [ ${#DDNS_PASSWORD} -lt $MINIMUM_PASSWORD_LENGTH ]; then
343
-                dialog --title $"Password quality check" --msgbox $"The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site." 10 40
344
-                DDNS_PASSWORD=""
345
-            fi
346
-        done
347
-        save_configuration_values
346
+                        ;;
347
+                    1) exit 1;;
348
+                    255) exit 1;;
349
+                esac
350
+                if [ ${#DDNS_PASSWORD} -lt $MINIMUM_PASSWORD_LENGTH ]; then
351
+                    dialog --title $"Password quality check" --msgbox $"The password given was too short. It must be at least $MINIMUM_PASSWORD_LENGTH characters. You may need to change your password on the dynamic DNS provider's web site." 10 40
352
+                    DDNS_PASSWORD=""
353
+                fi
354
+            done
355
+            save_configuration_values
356
+        fi
348 357
     fi
349 358
 }
350 359