Bladeren bron

Moving back to using freedns codes

Bob Mottram 10 jaren geleden
bovenliggende
commit
ac81c37bf4
2 gewijzigde bestanden met toevoegingen van 197 en 32 verwijderingen
  1. 20
    0
      src/freedombone
  2. 177
    32
      src/freedombone-config

+ 20
- 0
src/freedombone Bestand weergeven

@@ -130,26 +130,31 @@ MEDIAGOBLIN_ADMIN_PASSWORD=
130 130
 
131 131
 # Domain name for microblog installation
132 132
 MICROBLOG_DOMAIN_NAME=
133
+MICROBLOG_CODE=
133 134
 MICROBLOG_REPO="git://gitorious.org/social/mainline.git"
134 135
 MICROBLOG_ADMIN_PASSWORD=
135 136
 
136 137
 # Domain name or redmatrix installation
137 138
 REDMATRIX_DOMAIN_NAME=
139
+REDMATRIX_CODE=
138 140
 REDMATRIX_REPO="https://github.com/friendica/red.git"
139 141
 REDMATRIX_ADDONS_REPO="https://github.com/friendica/red-addons.git"
140 142
 REDMATRIX_ADMIN_PASSWORD=
141 143
 
142 144
 # Domain name for Owncloud installation
143 145
 OWNCLOUD_DOMAIN_NAME=
146
+OWNCLOUD_CODE=
144 147
 OWNCLOUD_ADMIN_PASSWORD=
145 148
 
146 149
 # Domain name for your wiki
147 150
 WIKI_DOMAIN_NAME=
148 151
 WIKI_ADMIN_PASSWORD=
149 152
 WIKI_TITLE="Freedombone Wiki"
153
+WIKI_CODE=
150 154
 
151 155
 # Domain name for your blog
152 156
 FULLBLOG_DOMAIN_NAME=
157
+FULLBLOG_CODE=
153 158
 MY_BLOG_TITLE="My Blog"
154 159
 MY_BLOG_SUBTITLE="Another Freedombone Blog"
155 160
 
@@ -803,18 +808,33 @@ function read_configuration {
803 808
       if grep -q "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
804 809
           MICROBLOG_DOMAIN_NAME=$(grep "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
805 810
       fi
811
+      if grep -q "MICROBLOG_CODE" $CONFIGURATION_FILE; then
812
+          MICROBLOG_CODE=$(grep "MICROBLOG_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
813
+      fi
806 814
       if grep -q "REDMATRIX_DOMAIN_NAME" $CONFIGURATION_FILE; then
807 815
           REDMATRIX_DOMAIN_NAME=$(grep "REDMATRIX_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
808 816
       fi
817
+      if grep -q "REDMATRIX_CODE" $CONFIGURATION_FILE; then
818
+          REDMATRIX_CODE=$(grep "REDMATRIX_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
819
+      fi
809 820
       if grep -q "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE; then
810 821
           OWNCLOUD_DOMAIN_NAME=$(grep "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
811 822
       fi
823
+      if grep -q "OWNCLOUD_CODE" $CONFIGURATION_FILE; then
824
+          OWNCLOUD_CODE=$(grep "OWNCLOUD_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
825
+      fi
812 826
       if grep -q "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE; then
813 827
           WIKI_DOMAIN_NAME=$(grep "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
814 828
       fi
829
+      if grep -q "WIKI_CODE" $CONFIGURATION_FILE; then
830
+          WIKI_CODE=$(grep "WIKI_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
831
+      fi
815 832
       if grep -q "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
816 833
           FULLBLOG_DOMAIN_NAME=$(grep "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
817 834
       fi
835
+      if grep -q "FULLBLOG_CODE" $CONFIGURATION_FILE; then
836
+          FULLBLOG_CODE=$(grep "FULLBLOG_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
837
+      fi
818 838
       if grep -q "MY_BLOG_TITLE" $CONFIGURATION_FILE; then
819 839
           MY_BLOG_TITLE=$(grep "MY_BLOG_TITLE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
820 840
       fi

+ 177
- 32
src/freedombone-config Bestand weergeven

@@ -69,11 +69,16 @@ NAMESERVER1=
69 69
 NAMESERVER2=
70 70
 WIKI_TITLE=
71 71
 WIKI_DOMAIN_NAME=
72
+WIKI_CODE=
72 73
 MY_BLOG_TITLE=
73 74
 FULLBLOG_DOMAIN_NAME=
75
+FULLBLOG_CODE=
74 76
 OWNCLOUD_DOMAIN_NAME=
77
+OWNCLOUD_CODE=
75 78
 REDMATRIX_DOMAIN_NAME=
79
+REDMATRIX_CODE=
76 80
 MICROBLOG_DOMAIN_NAME=
81
+MICROBLOG_CODE=
77 82
 
78 83
 CONFIGURATION_FILE=
79 84
 
@@ -157,21 +162,36 @@ function save_configuration_file {
157 162
   if [ $WIKI_DOMAIN_NAME ]; then
158 163
       echo "WIKI_DOMAIN_NAME=$WIKI_DOMAIN_NAME" >> $CONFIGURATION_FILE
159 164
   fi
165
+  if [ $WIKI_CODE ]; then
166
+      echo "WIKI_CODE=$WIKI_CODE" >> $CONFIGURATION_FILE
167
+  fi
160 168
   if [ $MY_BLOG_TITLE ]; then
161 169
       echo "MY_BLOG_TITLE=$MY_BLOG_TITLE" >> $CONFIGURATION_FILE
162 170
   fi
163 171
   if [ $FULLBLOG_DOMAIN_NAME ]; then
164 172
       echo "FULLBLOG_DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME" >> $CONFIGURATION_FILE
165 173
   fi
174
+  if [ $FULLBLOG_CODE ]; then
175
+      echo "FULLBLOG_CODE=$FULLBLOG_CODE" >> $CONFIGURATION_FILE
176
+  fi
166 177
   if [ $OWNCLOUD_DOMAIN_NAME ]; then
167 178
       echo "OWNCLOUD_DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME" >> $CONFIGURATION_FILE
168 179
   fi
180
+  if [ $OWNCLOUD_CODE ]; then
181
+      echo "OWNCLOUD_CODE=$OWNCLOUD_CODE" >> $CONFIGURATION_FILE
182
+  fi
169 183
   if [ $REDMATRIX_DOMAIN_NAME ]; then
170 184
       echo "REDMATRIX_DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME" >> $CONFIGURATION_FILE
171 185
   fi
186
+  if [ $REDMATRIX_CODE ]; then
187
+      echo "REDMATRIX_CODE=$REDMATRIX_CODE" >> $CONFIGURATION_FILE
188
+  fi
172 189
   if [ $MICROBLOG_DOMAIN_NAME ]; then
173 190
       echo "MICROBLOG_DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME" >> $CONFIGURATION_FILE
174 191
   fi
192
+  if [ $MICROBLOG_CODE ]; then
193
+      echo "MICROBLOG_CODE=$MICROBLOG_CODE" >> $CONFIGURATION_FILE
194
+  fi
175 195
 }
176 196
 
177 197
 # test a domain name to see if it's valid
@@ -194,6 +214,8 @@ function interactive_configuration {
194 214
       cp $CONFIGURATION_FILE temp.cfg
195 215
   fi
196 216
 
217
+  FREEDNS_MESSAGE="Please enter the FreeDNS code for this domain"
218
+
197 219
   dialog --title "Freedombone" --msgbox "Welcome to the Freedombone interactive installer. Communications freedom is only a short time away.\n\nEnsure that you have your domain and dynamic DNS settings ready.\n\nFor more information please visit $FREEDOMBONE_WEBSITE or send a Bitmessage to $FREEDOMBONE_BITMESSAGE" 15 50
198 220
 
199 221
   data=$(tempfile 2>/dev/null)
@@ -585,16 +607,28 @@ function interactive_configuration {
585 607
   save_configuration_file
586 608
 
587 609
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
588
-      while [ ! $WIKI_DOMAIN_NAME ]
610
+      WIKI_DETAILS_COMPLETE=
611
+      while [ ! $WIKI_DETAILS_COMPLETE ]
589 612
       do
590 613
           data=$(tempfile 2>/dev/null)
591 614
           trap "rm -f $data" 0 1 2 5 15
592
-          dialog --backtitle "Freedombone Configuration" \
593
-                 --title "Wiki Configuration" \
594
-                 --form "\nPlease enter your wiki details:" 11 55 3 \
595
-                 "Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
596
-                 "Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
597
-                 2> $data
615
+
616
+          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
617
+              dialog --backtitle "Freedombone Configuration" \
618
+                     --title "Wiki Configuration" \
619
+                     --form "\nPlease enter your wiki details:" 11 55 4 \
620
+                     "Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
621
+                     "Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
622
+                     "Code:" 3 1 "$(grep 'WIKI_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 40 \
623
+                     2> $data
624
+          else
625
+              dialog --backtitle "Freedombone Configuration" \
626
+                     --title "Wiki Configuration" \
627
+                     --form "\nPlease enter your wiki details:" 11 55 3 \
628
+                     "Title:" 1 1 "$(grep 'WIKI_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 40 \
629
+                     "Domain:" 2 1 "$(grep 'WIKI_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 40 \
630
+                     2> $data
631
+          fi
598 632
           sel=$?
599 633
           case $sel in
600 634
               1) exit 0;;
@@ -608,23 +642,45 @@ function interactive_configuration {
608 642
               if [[ $TEST_DOMAIN_NAME != $WIKI_DOMAIN_NAME ]]; then
609 643
                   WIKI_DOMAIN_NAME=
610 644
                   dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
645
+              else
646
+                  if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
647
+                      WIKI_CODE=$(cat $data | sed -n 3p)
648
+                      if [ ${#WIKI_CODE} -lt 5 ]; then
649
+                          WIKI_DOMAIN_NAME=
650
+                          dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
651
+                      fi
652
+                  fi
611 653
               fi
612 654
           fi
655
+          if [ $WIKI_DOMAIN_NAME ]; then
656
+              WIKI_DETAILS_COMPLETE="yes"
657
+          fi
613 658
       done
614 659
       save_configuration_file
615 660
   fi
616 661
 
617 662
   if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
618
-      while [ ! $FULLBLOG_DOMAIN_NAME ]
663
+      FULLBLOG_DETAILS_COMPLETE=
664
+      while [ ! $FULLBLOG_DETAILS_COMPLETE ]
619 665
       do
620 666
           data=$(tempfile 2>/dev/null)
621 667
           trap "rm -f $data" 0 1 2 5 15
622
-          dialog --backtitle "Freedombone Configuration" \
623
-                 --title "Blog Configuration" \
624
-                 --form "\nPlease enter your blog details:" 11 55 3 \
625
-                 "Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
626
-                 "Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
627
-                 2> $data
668
+          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
669
+              dialog --backtitle "Freedombone Configuration" \
670
+                     --title "Blog Configuration" \
671
+                     --form "\nPlease enter your blog details:" 11 55 4 \
672
+                     "Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
673
+                     "Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
674
+                     "Code:" 3 1 "$(grep 'FULLBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 3 16 25 30 \
675
+                     2> $data
676
+          else
677
+              dialog --backtitle "Freedombone Configuration" \
678
+                     --title "Blog Configuration" \
679
+                     --form "\nPlease enter your blog details:" 11 55 3 \
680
+                     "Title:" 1 1 "$(grep 'MY_BLOG_TITLE' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
681
+                     "Domain:" 2 1 "$(grep 'FULLBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
682
+                     2> $data
683
+          fi
628 684
           sel=$?
629 685
           case $sel in
630 686
               1) exit 0;;
@@ -641,22 +697,43 @@ function interactive_configuration {
641 697
               if [[ $TEST_DOMAIN_NAME != $FULLBLOG_DOMAIN_NAME ]]; then
642 698
                   FULLBLOG_DOMAIN_NAME=
643 699
                   dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
700
+              else
701
+                  if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
702
+                      FULLBLOG_CODE=$(cat $data | sed -n 3p)
703
+                      if [ ${#FULLBLOG_CODE} -lt 5 ]; then
704
+                          FULLBLOG_DOMAIN_NAME=
705
+                          dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
706
+                      fi
707
+                  fi
644 708
               fi
645 709
           fi
710
+          if [ $FULLBLOG_DOMAIN_NAME ]; then
711
+              FULLBLOG_DETAILS_COMPLETE="yes"
712
+          fi
646 713
       done
647 714
       save_configuration_file
648 715
   fi
649 716
 
650 717
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
651
-      while [ ! $OWNCLOUD_DOMAIN_NAME ]
718
+      OWNCLOUD_DETAILS_COMPLETE=
719
+      while [ ! $OWNCLOUD_DETAILS_COMPLETE ]
652 720
       do
653 721
           data=$(tempfile 2>/dev/null)
654 722
           trap "rm -f $data" 0 1 2 5 15
655
-          dialog --backtitle "Freedombone Configuration" \
656
-                 --title "Owncloud Configuration" \
657
-                 --form "\nPlease enter your Owncloud details:" 11 55 3 \
658
-                 "Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
659
-                 2> $data
723
+          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
724
+              dialog --backtitle "Freedombone Configuration" \
725
+                     --title "Owncloud Configuration" \
726
+                     --form "\nPlease enter your Owncloud details:" 11 55 3 \
727
+                     "Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
728
+                     "Code:" 2 1 "$(grep 'OWNCLOUD_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
729
+                     2> $data
730
+          else
731
+              dialog --backtitle "Freedombone Configuration" \
732
+                     --title "Owncloud Configuration" \
733
+                     --form "\nPlease enter your Owncloud details:" 11 55 3 \
734
+                     "Domain:" 1 1 "$(grep 'OWNCLOUD_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
735
+                     2> $data
736
+          fi
660 737
           sel=$?
661 738
           case $sel in
662 739
               1) exit 0;;
@@ -669,22 +746,43 @@ function interactive_configuration {
669 746
               if [[ $TEST_DOMAIN_NAME != $OWNCLOUD_DOMAIN_NAME ]]; then
670 747
                   OWNCLOUD_DOMAIN_NAME=
671 748
                   dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
749
+              else
750
+                  if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
751
+                      OWNCLOUD_CODE=$(cat $data | sed -n 2p)
752
+                      if [ ${#OWNCLOUD_CODE} -lt 5 ]; then
753
+                          OWNCLOUD_DOMAIN_NAME=
754
+                          dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
755
+                      fi
756
+                  fi
672 757
               fi
673 758
           fi
759
+          if [ $OWNCLOUD_DOMAIN_NAME ]; then
760
+              OWNCLOUD_DETAILS_COMPLETE="yes"
761
+          fi
674 762
       done
675 763
       save_configuration_file
676 764
   fi
677 765
 
678 766
   if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
679
-      while [ ! $REDMATRIX_DOMAIN_NAME ]
767
+      REDMATRIX_DETAILS_COMPLETE=
768
+      while [ ! $REDMATRIX_DETAILS_COMPLETE ]
680 769
       do
681 770
           data=$(tempfile 2>/dev/null)
682 771
           trap "rm -f $data" 0 1 2 5 15
683
-          dialog --backtitle "Freedombone Configuration" \
684
-                 --title "RedMatrix Configuration" \
685
-                 --form "\nPlease enter your RedMatrix details:" 11 55 3 \
686
-                 "Domain:" 1 1 "$(grep 'REDMATRIX_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
687
-                 2> $data
772
+          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
773
+              dialog --backtitle "Freedombone Configuration" \
774
+                     --title "RedMatrix Configuration" \
775
+                     --form "\nPlease enter your RedMatrix details:" 11 55 3 \
776
+                     "Domain:" 1 1 "$(grep 'REDMATRIX_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
777
+                     "Code:" 2 1 "$(grep 'REDMATRIX_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
778
+                     2> $data
779
+          else
780
+              dialog --backtitle "Freedombone Configuration" \
781
+                     --title "RedMatrix Configuration" \
782
+                     --form "\nPlease enter your RedMatrix details:" 11 55 3 \
783
+                     "Domain:" 1 1 "$(grep 'REDMATRIX_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
784
+                     2> $data
785
+          fi
688 786
           sel=$?
689 787
           case $sel in
690 788
               1) exit 0;;
@@ -697,22 +795,43 @@ function interactive_configuration {
697 795
               if [[ $TEST_DOMAIN_NAME != $REDMATRIX_DOMAIN_NAME ]]; then
698 796
                   REDMATRIX_DOMAIN_NAME=
699 797
                   dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
798
+              else
799
+                  if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
800
+                      REDMATRIX_CODE=$(cat $data | sed -n 2p)
801
+                      if [ ${#REDMATRIX_CODE} -lt 5 ]; then
802
+                          REDMATRIX_DOMAIN_NAME=
803
+                          dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
804
+                      fi
805
+                  fi
700 806
               fi
701 807
           fi
808
+          if [ $REDMATRIX_DOMAIN_NAME ]; then
809
+              REDMATRIX_DETAILS_COMPLETE="yes"
810
+          fi
702 811
       done
703 812
       save_configuration_file
704 813
   fi
705 814
 
706 815
   if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_FULL" ]]; then
707
-      while [ ! $MICROBLOG_DOMAIN_NAME ]
816
+      MICROBLOG_DETAILS_COMPLETE=
817
+      while [ ! $MICROBLOG_DETAILS_COMPLETE ]
708 818
       do
709 819
           data=$(tempfile 2>/dev/null)
710 820
           trap "rm -f $data" 0 1 2 5 15
711
-          dialog --backtitle "Freedombone Configuration" \
712
-                 --title "Microblog Configuration" \
713
-                 --form "\nPlease enter your Microblog details:" 11 55 3 \
714
-                 "Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
715
-                 2> $data
821
+          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
822
+              dialog --backtitle "Freedombone Configuration" \
823
+                     --title "Microblog Configuration" \
824
+                     --form "\nPlease enter your Microblog details:" 11 55 3 \
825
+                     "Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
826
+                     "Code:" 2 1 "$(grep 'MICROBLOG_CODE' temp.cfg | awk -F '=' '{print $2}')" 2 16 25 30 \
827
+                     2> $data
828
+          else
829
+              dialog --backtitle "Freedombone Configuration" \
830
+                     --title "Microblog Configuration" \
831
+                     --form "\nPlease enter your Microblog details:" 11 55 3 \
832
+                     "Domain:" 1 1 "$(grep 'MICROBLOG_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 1 16 25 30 \
833
+                     2> $data
834
+          fi
716 835
           sel=$?
717 836
           case $sel in
718 837
               1) exit 0;;
@@ -728,8 +847,19 @@ function interactive_configuration {
728 847
               if [[ $TEST_DOMAIN_NAME != $MICROBLOG_DOMAIN_NAME ]]; then
729 848
                   MICROBLOG_DOMAIN_NAME=
730 849
                   dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50
850
+              else
851
+                  if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
852
+                      MICROBLOG_CODE=$(cat $data | sed -n 2p)
853
+                      if [ ${#MICROBLOG_CODE} -lt 5 ]; then
854
+                          MICROBLOG_DOMAIN_NAME=
855
+                          dialog --title "FreeDNS code" --msgbox "$FREEDNS_MESSAGE" 15 50
856
+                      fi
857
+                  fi
731 858
               fi
732 859
           fi
860
+          if [ $MICROBLOG_DOMAIN_NAME ]; then
861
+              MICROBLOG_DETAILS_COMPLETE="yes"
862
+          fi
733 863
       done
734 864
       save_configuration_file
735 865
   fi
@@ -851,18 +981,33 @@ function read_configuration {
851 981
       if grep -q "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
852 982
           MICROBLOG_DOMAIN_NAME=$(grep "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
853 983
       fi
984
+      if grep -q "MICROBLOG_CODE" $CONFIGURATION_FILE; then
985
+          MICROBLOG_CODE=$(grep "MICROBLOG_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
986
+      fi
854 987
       if grep -q "REDMATRIX_DOMAIN_NAME" $CONFIGURATION_FILE; then
855 988
           REDMATRIX_DOMAIN_NAME=$(grep "REDMATRIX_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
856 989
       fi
990
+      if grep -q "REDMATRIX_CODE" $CONFIGURATION_FILE; then
991
+          REDMATRIX_CODE=$(grep "REDMATRIX_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
992
+      fi
857 993
       if grep -q "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE; then
858 994
           OWNCLOUD_DOMAIN_NAME=$(grep "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
859 995
       fi
996
+      if grep -q "OWNCLOUD_CODE" $CONFIGURATION_FILE; then
997
+          OWNCLOUD_CODE=$(grep "OWNCLOUD_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
998
+      fi
860 999
       if grep -q "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE; then
861 1000
           WIKI_DOMAIN_NAME=$(grep "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
862 1001
       fi
1002
+      if grep -q "WIKI_CODE" $CONFIGURATION_FILE; then
1003
+          WIKI_CODE=$(grep "WIKI_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1004
+      fi
863 1005
       if grep -q "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
864 1006
           FULLBLOG_DOMAIN_NAME=$(grep "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
865 1007
       fi
1008
+      if grep -q "FULLBLOG_CODE" $CONFIGURATION_FILE; then
1009
+          FULLBLOG_CODE=$(grep "FULLBLOG_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1010
+      fi
866 1011
       if grep -q "MY_BLOG_TITLE" $CONFIGURATION_FILE; then
867 1012
           MY_BLOG_TITLE=$(grep "MY_BLOG_TITLE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
868 1013
       fi