Explorar el Código

Remove subdomain codes

Bob Mottram hace 10 años
padre
commit
545813bdaa
Se han modificado 4 ficheros con 35 adiciones y 309 borrados
  1. 1
    9
      README.md
  2. 1
    11
      doc/installation.org
  3. BIN
      man/freedombone.1.gz
  4. 33
    289
      src/freedombone

+ 1
- 9
README.md Ver fichero

@@ -114,14 +114,6 @@ Add the following, and set the values as needed.
114 114
 
115 115
 Both of the IP addresses are local IP addresses, typically of the form 192.168.x.x, with one being for the system and the other being for the internet router.
116 116
 
117
-If you are using FreeDNS as a dynamic DNS provider then you can add the following to your configuration file, setting the subdomain codes as appropriate. You can find the codes on the FreeDNS site under "Dynamic DNS" followed by "quick cron example" then look for the code on the last line between the ? and = characters.
118
-
119
-    FULLBLOG_FREEDNS_SUBDOMAIN_CODE=
120
-    REDMATRIX_FREEDNS_SUBDOMAIN_CODE=
121
-    MICROBLOG_FREEDNS_SUBDOMAIN_CODE=
122
-    OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=
123
-    WIKI_FREEDNS_SUBDOMAIN_CODE=
124
-
125 117
 Save the configuration file and exit from your editor.
126 118
 
127 119
 Now you can begin the installation. If you are doing this on a Beaglebone Black:
@@ -132,7 +124,7 @@ Or on any other system don't include the *--bbb* option.
132 124
 
133 125
     freedombone -d [default domain name] -u [username] --ddns [dynamic DNS provider domain] --ddnsuser [dynamic DNS username] --ddnspass [dynamic DNS password]
134 126
 
135
-The above command should be run in the same directory in which your configuration file exists. You can use any of your domains as the default one, but typically the default domain is the same as the one for your wiki. If you are using FreeDNS as the dynamic DNS provider then also add the -c option to specify the code corresponding to the subdomain.
127
+The above command should be run in the same directory in which your configuration file exists. You can use any of your domains as the default one, but typically the default domain is the same as the one for your wiki.
136 128
 
137 129
 Also see the manpage for additional options which can be used instead of a configuration file. If you don't specify a variant type with the final option then everything will be installed. If you have a *freedombone.cfg* file then it should be in the same directory from which the *freedombone* command is run.
138 130
 

+ 1
- 11
doc/installation.org Ver fichero

@@ -118,16 +118,6 @@ ROUTER_IP_ADDRESS=
118 118
 
119 119
 Both of the IP addresses are local IP addresses, typically of the form 192.168.x.x, with one being for the system and the other being for the internet router.
120 120
 
121
-If you are using FreeDNS as a dynamic DNS provider then you can add the following to your configuration file, setting the subdomain codes as appropriate. You can find the codes on the FreeDNS site under "Dynamic DNS" followed by "quick cron example" then look for the code on the last line between the ? and = characters.
122
-
123
-#+BEGIN_SRC bash
124
-FULLBLOG_FREEDNS_SUBDOMAIN_CODE=
125
-REDMATRIX_FREEDNS_SUBDOMAIN_CODE=
126
-MICROBLOG_FREEDNS_SUBDOMAIN_CODE=
127
-OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=
128
-WIKI_FREEDNS_SUBDOMAIN_CODE=
129
-#+END_SRC
130
-
131 121
 Save the configuration file and exit from your editor.
132 122
 
133 123
 Now you can begin the installation. If you are doing this on a Beaglebone Black:
@@ -142,7 +132,7 @@ Or on any other system don't include the *--bbb* option.
142 132
 freedombone -d [default domain name] -u [username] --ddns [dynamic DNS provider domain] --ddnsuser [dynamic DNS username] --ddnspass [dynamic DNS password]
143 133
 #+END_SRC
144 134
 
145
-The above command should be run in the same directory in which your configuration file exists. You can use any of your domains as the default one, but typically the default domain is the same as the one for your wiki. If you are using FreeDNS as the dynamic DNS provider then also add the -c option to specify the code corresponding to the subdomain.
135
+The above command should be run in the same directory in which your configuration file exists. You can use any of your domains as the default one, but typically the default domain is the same as the one for your wiki.
146 136
 
147 137
 Also see the manpage for additional options which can be used instead of a configuration file. If you don't specify a variant type with the final option then everything will be installed. If you have a *freedombone.cfg* file then it should be in the same directory from which the *freedombone* command is run.
148 138
 

BIN
man/freedombone.1.gz Ver fichero


+ 33
- 289
src/freedombone Ver fichero

@@ -30,60 +30,11 @@
30 30
 #
31 31
 # You should have received a copy of the GNU General Public License
32 32
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
33
-#
34
-# Summary
35
-# =======
36
-#
37
-# This script is intended to be run on the target device, which
38
-# is typically a Beaglebone Black.
39
-#
40
-# To be able to run this script you need to get to a condition
41
-# where you have Debian Jessie installed, with at least one
42
-# unprivileged user account and at least one subdomain created on
43
-# https://freedns.afraid.org/. If you're not installing on a
44
-# Beaglebone Black then set the variable INSTALLING_ON_BBB to "no"
45
-#
46
-# Note on dynamic dns
47
-# ===================
48
-#
49
-# I'm not particularly trying to promote freedns.afraid.org
50
-# as a service, it just happens to be a dynamic DNS system which
51
-# provides free (as in beer) accounts, and I'm trying to make the
52
-# process of setting up a working server as trivial as possible.
53
-# Other dynamic DNS systems are available, and if you're using
54
-# something different then comment out the section within
55
-# argument_checks and the call to dynamic_dns_freedns.
56
-#
57
-# Prerequisites
58
-# =============
59
-#
60
-# You will need to initially prepare a microSD card with a Debian
61
-# image on it. This can be done using the initial_setup.sh script.
62
-#
63
-# If you are not using a Beaglebone Black then just prepare the
64
-# target system with a fresh installation of Debian Jessie.
65
-#
66
-# Configuration file
67
-# ==================
68
-# If you don't want to edit this script directly then you can
69
-# create a configuration file called freedombone.cfg, which should
70
-# be in the same directory as install-freedombone.sh.
71
-# Within the configuration file you can specify the main settings
72
-# such as:
73
-#
74
-# INSTALLING_ON_BBB=yes
75
-# SSH_PORT=2222
76
-# MICROBLOG_DOMAIN_NAME=mydomain
77
-# MICROBLOG_FREEDNS_SUBDOMAIN_CODE=[code]
78
-# ...
79
-#
80
-# Note that there are no spaces around the equals.
81 33
 
82 34
 NO_OF_ARGS=$#
83 35
 
84 36
 DOMAIN_NAME=
85 37
 MY_USERNAME=
86
-FREEDNS_SUBDOMAIN_CODE=
87 38
 SYSTEM_TYPE=
88 39
 
89 40
 # Are we installing on a Beaglebone Black (BBB) or some other system?
@@ -114,7 +65,6 @@ DDNS_PROVIDER="default@freedns.afraid.org"
114 65
 DDNS_USERNAME=
115 66
 DDNS_PASSWORD=
116 67
 CURRENT_DDNS_DOMAIN=
117
-CURRENT_DDNS_CODE=
118 68
 
119 69
 # Minimum number of characters in a password
120 70
 MINIMUM_PASSWORD_LENGTH=10
@@ -163,39 +113,33 @@ PUBLIC_MAILING_LIST_DIRECTORY="/var/spool/mlmmj"
163 113
 # There should be no spaces in the name
164 114
 PRIVATE_MAILING_LIST=
165 115
 
166
-# Domain name or freedns subdomain for mediagoblin installation
116
+# Domain name for mediagoblin installation
167 117
 MEDIAGOBLIN_DOMAIN_NAME=
168
-MEDIAGOBLIN_FREEDNS_SUBDOMAIN_CODE=
169 118
 MEDIAGOBLIN_REPO=""
170 119
 MEDIAGOBLIN_ADMIN_PASSWORD=
171 120
 
172
-# Domain name or freedns subdomain for microblog installation
121
+# Domain name for microblog installation
173 122
 MICROBLOG_DOMAIN_NAME=
174
-MICROBLOG_FREEDNS_SUBDOMAIN_CODE=
175 123
 MICROBLOG_REPO="git://gitorious.org/social/mainline.git"
176 124
 MICROBLOG_ADMIN_PASSWORD=
177 125
 
178 126
 # Domain name or redmatrix installation
179 127
 REDMATRIX_DOMAIN_NAME=
180
-REDMATRIX_FREEDNS_SUBDOMAIN_CODE=
181 128
 REDMATRIX_REPO="https://github.com/friendica/red.git"
182 129
 REDMATRIX_ADDONS_REPO="https://github.com/friendica/red-addons.git"
183 130
 REDMATRIX_ADMIN_PASSWORD=
184 131
 
185
-# Domain name and freedns subdomain for Owncloud installation
132
+# Domain name for Owncloud installation
186 133
 OWNCLOUD_DOMAIN_NAME=
187
-OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=
188 134
 OWNCLOUD_ADMIN_PASSWORD=
189 135
 
190
-# Domain name and freedns subdomain for your wiki
136
+# Domain name for your wiki
191 137
 WIKI_DOMAIN_NAME=
192
-WIKI_FREEDNS_SUBDOMAIN_CODE=
193 138
 WIKI_ADMIN_PASSWORD=
194 139
 WIKI_TITLE="Freedombone Wiki"
195 140
 
196
-# Domain name and freedns subdomain for your blog
141
+# Domain name for your blog
197 142
 FULLBLOG_DOMAIN_NAME=
198
-FULLBLOG_FREEDNS_SUBDOMAIN_CODE=
199 143
 MY_BLOG_TITLE="My Blog"
200 144
 MY_BLOG_SUBTITLE="Another Freedombone Blog"
201 145
 
@@ -340,7 +284,7 @@ CJDNS_PORT=
340 284
 
341 285
 function show_help {
342 286
   echo ''
343
-  echo 'freedombone -d [domain] -u [username] -c [FreeDNS subdomain code] -s [system type]'
287
+  echo 'freedombone -d [domain] -u [username] -s [system type]'
344 288
   echo ''
345 289
   echo '  -h --help             Show help'
346 290
   echo '     menuconfig         Easy interactive installation'
@@ -354,13 +298,6 @@ function show_help {
354 298
   echo '     --ddnsuser         Dynamic DNS provider username'
355 299
   echo '     --ddnspass         Dynamic DNS provider password'
356 300
   echo ''
357
-  echo '  -c --code             Default domain FreeDNS code'
358
-  echo '     --microblogcode    Microblog FreeDNS code'
359
-  echo '     --wikicode         Wiki FreeDNS code'
360
-  echo '     --owncloudcode     Owncloud FreeDNS code'
361
-  echo '     --redmatrixcode    Redmatrix FreeDNS code'
362
-  echo '     --blogcode         Blog FreeDNS code'
363
-  echo ''
364 301
   echo '     --microblogdomain  Microblog domain name'
365 302
   echo '     --wikidomain       Wiki domain name'
366 303
   echo '     --blogdomain       Blog domain name'
@@ -457,39 +394,21 @@ function save_configuration_file {
457 394
   if [ $WIKI_DOMAIN_NAME ]; then
458 395
       echo "WIKI_DOMAIN_NAME=$WIKI_DOMAIN_NAME" >> freedombone.cfg
459 396
   fi
460
-  if [ $WIKI_FREEDNS_SUBDOMAIN_CODE ]; then
461
-      echo "WIKI_FREEDNS_SUBDOMAIN_CODE=$WIKI_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg
462
-  fi
463
-  if [ $FREEDNS_SUBDOMAIN_CODE ]; then
464
-      echo "FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg
465
-  fi
466 397
   if [ $MY_BLOG_TITLE ]; then
467 398
       echo "MY_BLOG_TITLE=$MY_BLOG_TITLE" >> freedombone.cfg
468 399
   fi
469 400
   if [ $FULLBLOG_DOMAIN_NAME ]; then
470 401
       echo "FULLBLOG_DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME" >> freedombone.cfg
471 402
   fi
472
-  if [ $FULLBLOG_FREEDNS_SUBDOMAIN_CODE ]; then
473
-      echo "FULLBLOG_FREEDNS_SUBDOMAIN_CODE=$FULLBLOG_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg
474
-  fi
475 403
   if [ $OWNCLOUD_DOMAIN_NAME ]; then
476 404
       echo "OWNCLOUD_DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME" >> freedombone.cfg
477 405
   fi
478
-  if [ $OWNCLOUD_FREEDNS_SUBDOMAIN_CODE ]; then
479
-      echo "OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$OWNCLOUD_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg
480
-  fi
481 406
   if [ $REDMATRIX_DOMAIN_NAME ]; then
482 407
       echo "REDMATRIX_DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME" >> freedombone.cfg
483 408
   fi
484
-  if [ $REDMATRIX_FREEDNS_SUBDOMAIN_CODE ]; then
485
-      echo "REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$REDMATRIX_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg
486
-  fi
487 409
   if [ $MICROBLOG_DOMAIN_NAME ]; then
488 410
       echo "MICROBLOG_DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME" >> freedombone.cfg
489 411
   fi
490
-  if [ $MICROBLOG_FREEDNS_SUBDOMAIN_CODE ]; then
491
-      echo "MICROBLOG_FREEDNS_SUBDOMAIN_CODE=$MICROBLOG_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg
492
-  fi
493 412
 }
494 413
 
495 414
 function interactive_configuration {
@@ -675,22 +594,12 @@ function interactive_configuration {
675 594
       do
676 595
           data=$(tempfile 2>/dev/null)
677 596
           trap "rm -f $data" 0 1 2 5 15
678
-          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
679
-              dialog --backtitle "Freedombone Configuration" \
680
-                  --title "Wiki Configuration" \
681
-                  --form "\nPlease enter your wiki details:" 11 55 4 \
682
-                  "Title:" 1 1 "My Wiki" 1 16 16 15 \
683
-                  "Domain:" 2 1 "" 2 16 16 15 \
684
-                  "FreeDNS code:" 3 1 "" 3 16 16 15 \
685
-                  2> $data
686
-          else
687
-              dialog --backtitle "Freedombone Configuration" \
688
-                  --title "Wiki Configuration" \
689
-                  --form "\nPlease enter your wiki details:" 11 55 3 \
690
-                  "Title:" 1 1 "My Wiki" 1 16 16 15 \
691
-                  "Domain:" 2 1 "" 2 16 16 15 \
692
-                  2> $data
693
-          fi
597
+          dialog --backtitle "Freedombone Configuration" \
598
+                 --title "Wiki Configuration" \
599
+                 --form "\nPlease enter your wiki details:" 11 55 3 \
600
+                 "Title:" 1 1 "My Wiki" 1 16 16 15 \
601
+                 "Domain:" 2 1 "" 2 16 16 15 \
602
+                 2> $data
694 603
           sel=$?
695 604
           case $sel in
696 605
               1) exit 0;;
@@ -702,16 +611,6 @@ function interactive_configuration {
702 611
               if [ ! $DOMAIN_NAME ]; then
703 612
                   DOMAIN_NAME=$WIKI_DOMAIN_NAME
704 613
               fi
705
-              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
706
-                  WIKI_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 3p)
707
-                  if [ ! $WIKI_FREEDNS_SUBDOMAIN_CODE ]; then
708
-                      WIKI_DOMAIN_NAME=""
709
-                  else
710
-                      if [[ $DOMAIN_NAME == "$WIKI_DOMAIN_NAME" ]]; then
711
-                          FREEDNS_SUBDOMAIN_CODE=$WIKI_FREEDNS_SUBDOMAIN_CODE
712
-                      fi
713
-                  fi
714
-              fi
715 614
           fi
716 615
       done
717 616
   fi
@@ -721,22 +620,12 @@ function interactive_configuration {
721 620
       do
722 621
           data=$(tempfile 2>/dev/null)
723 622
           trap "rm -f $data" 0 1 2 5 15
724
-          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
725
-              dialog --backtitle "Freedombone Configuration" \
726
-                  --title "Blog Configuration" \
727
-                  --form "\nPlease enter your blog details:" 11 55 4 \
728
-                  "Title:" 1 1 "My Blog" 1 16 16 15 \
729
-                  "Domain:" 2 1 "" 2 16 16 15 \
730
-                  "FreeDNS code:" 3 1 "" 3 16 16 15 \
731
-                  2> $data
732
-          else
733
-              dialog --backtitle "Freedombone Configuration" \
734
-                  --title "Blog Configuration" \
735
-                  --form "\nPlease enter your blog details:" 11 55 3 \
736
-                  "Title:" 1 1 "My Blog" 1 16 16 15 \
737
-                  "Domain:" 2 1 "" 2 16 16 15 \
738
-                  2> $data
739
-          fi
623
+          dialog --backtitle "Freedombone Configuration" \
624
+                 --title "Blog Configuration" \
625
+                 --form "\nPlease enter your blog details:" 11 55 3 \
626
+                 "Title:" 1 1 "My Blog" 1 16 16 15 \
627
+                 "Domain:" 2 1 "" 2 16 16 15 \
628
+                 2> $data
740 629
           sel=$?
741 630
           case $sel in
742 631
               1) exit 0;;
@@ -751,16 +640,6 @@ function interactive_configuration {
751 640
               if [ ! $DOMAIN_NAME ]; then
752 641
                   DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME
753 642
               fi
754
-              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
755
-                  FULLBLOG_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 3p)
756
-                  if [ ! $FULLBLOG_FREEDNS_SUBDOMAIN_CODE ]; then
757
-                      FULLBLOG_DOMAIN_NAME=""
758
-                  else
759
-                      if [[ $DOMAIN_NAME == "$FULLBLOG_DOMAIN_NAME" ]]; then
760
-                          FREEDNS_SUBDOMAIN_CODE=$FULLBLOG_FREEDNS_SUBDOMAIN_CODE
761
-                      fi
762
-                  fi
763
-              fi
764 643
           fi
765 644
       done
766 645
   fi
@@ -770,20 +649,11 @@ function interactive_configuration {
770 649
       do
771 650
           data=$(tempfile 2>/dev/null)
772 651
           trap "rm -f $data" 0 1 2 5 15
773
-          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
774
-              dialog --backtitle "Freedombone Configuration" \
775
-                  --title "Owncloud Configuration" \
776
-                  --form "\nPlease enter your Owncloud details:" 11 55 3 \
777
-                  "Domain:" 1 1 "" 1 16 16 15 \
778
-                  "FreeDNS code:" 2 1 "" 2 16 16 15 \
779
-                  2> $data
780
-          else
781
-              dialog --backtitle "Freedombone Configuration" \
782
-                  --title "Owncloud Configuration" \
783
-                  --form "\nPlease enter your Owncloud details:" 11 55 3 \
784
-                  "Domain:" 1 1 "" 1 16 16 15 \
785
-                  2> $data
786
-          fi
652
+          dialog --backtitle "Freedombone Configuration" \
653
+                 --title "Owncloud Configuration" \
654
+                 --form "\nPlease enter your Owncloud details:" 11 55 3 \
655
+                 "Domain:" 1 1 "" 1 16 16 15 \
656
+                 2> $data
787 657
           sel=$?
788 658
           case $sel in
789 659
               1) exit 0;;
@@ -794,16 +664,6 @@ function interactive_configuration {
794 664
               if [ ! $DOMAIN_NAME ]; then
795 665
                   DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME
796 666
               fi
797
-              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
798
-                  OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p)
799
-                  if [ ! $OWNCLOUD_FREEDNS_SUBDOMAIN_CODE ]; then
800
-                      OWNCLOUD_DOMAIN_NAME=""
801
-                  else
802
-                      if [[ $DOMAIN_NAME == "$OWNCLOUD_DOMAIN_NAME" ]]; then
803
-                          FREEDNS_SUBDOMAIN_CODE=$OWNCLOUD_FREEDNS_SUBDOMAIN_CODE
804
-                      fi
805
-                  fi
806
-              fi
807 667
           fi
808 668
       done
809 669
   fi
@@ -813,20 +673,11 @@ function interactive_configuration {
813 673
       do
814 674
           data=$(tempfile 2>/dev/null)
815 675
           trap "rm -f $data" 0 1 2 5 15
816
-          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
817
-              dialog --backtitle "Freedombone Configuration" \
818
-                  --title "RedMatrix Configuration" \
819
-                  --form "\nPlease enter your RedMatrix details:" 11 55 3 \
820
-                  "Domain:" 1 1 "" 1 16 16 15 \
821
-                  "FreeDNS code:" 2 1 "" 2 16 16 15 \
822
-                  2> $data
823
-          else
824
-              dialog --backtitle "Freedombone Configuration" \
825
-                  --title "RedMatrix Configuration" \
826
-                  --form "\nPlease enter your RedMatrix details:" 11 55 3 \
827
-                  "Domain:" 1 1 "" 1 16 16 15 \
828
-                  2> $data
829
-          fi
676
+          dialog --backtitle "Freedombone Configuration" \
677
+                 --title "RedMatrix Configuration" \
678
+                 --form "\nPlease enter your RedMatrix details:" 11 55 3 \
679
+                 "Domain:" 1 1 "" 1 16 16 15 \
680
+                 2> $data
830 681
           sel=$?
831 682
           case $sel in
832 683
               1) exit 0;;
@@ -837,16 +688,6 @@ function interactive_configuration {
837 688
               if [ ! $DOMAIN_NAME ]; then
838 689
                   DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME
839 690
               fi
840
-              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
841
-                  REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p)
842
-                  if [ ! $REDMATRIX_FREEDNS_SUBDOMAIN_CODE ]; then
843
-                      REDMATRIX_DOMAIN_NAME=""
844
-                  else
845
-                      if [[ $DOMAIN_NAME == "$REDMATRIX_DOMAIN_NAME" ]]; then
846
-                          FREEDNS_SUBDOMAIN_CODE=$REDMATRIX_FREEDNS_SUBDOMAIN_CODE
847
-                      fi
848
-                  fi
849
-              fi
850 691
           fi
851 692
       done
852 693
   fi
@@ -856,20 +697,11 @@ function interactive_configuration {
856 697
       do
857 698
           data=$(tempfile 2>/dev/null)
858 699
           trap "rm -f $data" 0 1 2 5 15
859
-          if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
860
-              dialog --backtitle "Freedombone Configuration" \
861
-                  --title "Microblog Configuration" \
862
-                  --form "\nPlease enter your Microblog details:" 11 55 3 \
863
-                  "Domain:" 1 1 "" 1 16 16 15 \
864
-                  "FreeDNS code:" 2 1 "" 2 16 16 15 \
865
-                  2> $data
866
-          else
867
-              dialog --backtitle "Freedombone Configuration" \
868
-                  --title "Microblog Configuration" \
869
-                  --form "\nPlease enter your Microblog details:" 11 55 3 \
870
-                  "Domain:" 1 1 "" 1 16 16 15 \
871
-                  2> $data
872
-          fi
700
+          dialog --backtitle "Freedombone Configuration" \
701
+                 --title "Microblog Configuration" \
702
+                 --form "\nPlease enter your Microblog details:" 11 55 3 \
703
+                 "Domain:" 1 1 "" 1 16 16 15 \
704
+                 2> $data
873 705
           sel=$?
874 706
           case $sel in
875 707
               1) exit 0;;
@@ -883,16 +715,6 @@ function interactive_configuration {
883 715
               if [ ! $DOMAIN_NAME ]; then
884 716
                   DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME
885 717
               fi
886
-              if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
887
-                  MICROBLOG_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p)
888
-                  if [ ! $MICROBLOG_FREEDNS_SUBDOMAIN_CODE ]; then
889
-                      MICROBLOG_DOMAIN_NAME=""
890
-                  else
891
-                      if [[ $DOMAIN_NAME == "$MICROBLOG_DOMAIN_NAME" ]]; then
892
-                          FREEDNS_SUBDOMAIN_CODE=$MICROBLOG_FREEDNS_SUBDOMAIN_CODE
893
-                      fi
894
-                  fi
895
-              fi
896 718
           fi
897 719
       done
898 720
   fi
@@ -911,22 +733,6 @@ function interactive_configuration {
911 733
               255) exit 0;;
912 734
           esac
913 735
       done
914
-
915
-      if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
916
-          while [ ! $FREEDNS_SUBDOMAIN_CODE ]
917
-          do
918
-              data=$(tempfile 2>/dev/null)
919
-              trap "rm -f $data" 0 1 2 5 15
920
-              dialog --backtitle "Freedombone Configuration" \
921
-                  --inputbox "FreeDNS subdomain code" 10 30 2> $data
922
-              sel=$?
923
-              case $sel in
924
-                  0) FREEDNS_SUBDOMAIN_CODE=$(cat $data);;
925
-                  1) exit 0;;
926
-                  255) exit 0;;
927
-              esac
928
-          done
929
-      fi
930 736
   fi
931 737
 
932 738
   while [ ! $MY_EMAIL_ADDRESS ]
@@ -980,61 +786,31 @@ case $key in
980 786
     shift
981 787
     MICROBLOG_DOMAIN_NAME="$1"
982 788
     ;;
983
-    # microblog domain code (freedns)
984
-    --microblogcode)
985
-    shift
986
-    MICROBLOG_FREEDNS_SUBDOMAIN_CODE="$1"
987
-    ;;
988 789
     # wiki domain name
989 790
     --wikidomain)
990 791
     shift
991 792
     WIKI_DOMAIN_NAME="$1"
992 793
     ;;
993
-    # wiki domain code (freedns)
994
-    --wikicode)
995
-    shift
996
-    WIKI_FREEDNS_SUBDOMAIN_CODE="$1"
997
-    ;;
998 794
     # blog domain name
999 795
     --blogdomain)
1000 796
     shift
1001 797
     FULLBLOG_DOMAIN_NAME="$1"
1002 798
     ;;
1003
-    # blog domain code (freedns)
1004
-    --blogcode)
1005
-    shift
1006
-    FULLBLOG_FREEDNS_SUBDOMAIN_CODE="$1"
1007
-    ;;
1008 799
     # owncloud domain name
1009 800
     --ownclouddomain)
1010 801
     shift
1011 802
     OWNCLOUD_DOMAIN_NAME="$1"
1012 803
     ;;
1013
-    # owncloud domain code (freedns)
1014
-    --owncloudcode)
1015
-    shift
1016
-    OWNCLOUD_FREEDNS_SUBDOMAIN_CODE="$1"
1017
-    ;;
1018 804
     # redmatrix domain name
1019 805
     --redmatrixdomain)
1020 806
     shift
1021 807
     REDMATRIX_DOMAIN_NAME="$1"
1022 808
     ;;
1023
-    # redmatrix domain code (freedns)
1024
-    --redmatrixcode)
1025
-    shift
1026
-    REDMATRIX_FREEDNS_SUBDOMAIN_CODE="$1"
1027
-    ;;
1028 809
     # default domain name
1029 810
     -d|--domain)
1030 811
     shift
1031 812
     DOMAIN_NAME="$1"
1032 813
     ;;
1033
-    # default domain code (freedns)
1034
-    -c|--code)
1035
-    shift
1036
-    FREEDNS_SUBDOMAIN_CODE="$1"
1037
-    ;;
1038 814
     # The type of system
1039 815
     -s|--system)
1040 816
     shift
@@ -1143,12 +919,6 @@ function parse_args {
1143 919
       echo 'Please provide the password for your dynamic DNS provider with the --ddnspass option'
1144 920
       exit 6382
1145 921
   fi
1146
-  if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
1147
-      if [ ! $FREEDNS_SUBDOMAIN_CODE ]; then
1148
-          show_help
1149
-          exit 4
1150
-      fi
1151
-  fi
1152 922
   if [ ! $SYSTEM_TYPE ]; then
1153 923
       SYSTEM_TYPE=$VARIANT_FULL
1154 924
   fi
@@ -1239,33 +1009,18 @@ function read_configuration {
1239 1009
       if grep -q "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
1240 1010
           MICROBLOG_DOMAIN_NAME=$(grep "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1241 1011
       fi
1242
-      if grep -q "MICROBLOG_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then
1243
-          MICROBLOG_FREEDNS_SUBDOMAIN_CODE=$(grep "MICROBLOG_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1244
-      fi
1245 1012
       if grep -q "REDMATRIX_DOMAIN_NAME" $CONFIGURATION_FILE; then
1246 1013
           REDMATRIX_DOMAIN_NAME=$(grep "REDMATRIX_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1247 1014
       fi
1248
-      if grep -q "REDMATRIX_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then
1249
-          REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$(grep "REDMATRIX_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1250
-      fi
1251 1015
       if grep -q "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE; then
1252 1016
           OWNCLOUD_DOMAIN_NAME=$(grep "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1253 1017
       fi
1254
-      if grep -q "OWNCLOUD_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then
1255
-          OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$(grep "OWNCLOUD_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1256
-      fi
1257 1018
       if grep -q "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE; then
1258 1019
           WIKI_DOMAIN_NAME=$(grep "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1259 1020
       fi
1260
-      if grep -q "WIKI_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then
1261
-          WIKI_FREEDNS_SUBDOMAIN_CODE=$(grep "WIKI_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1262
-      fi
1263 1021
       if grep -q "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
1264 1022
           FULLBLOG_DOMAIN_NAME=$(grep "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1265 1023
       fi
1266
-      if grep -q "FULLBLOG_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then
1267
-          FULLBLOG_FREEDNS_SUBDOMAIN_CODE=$(grep "FULLBLOG_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1268
-      fi
1269 1024
       if grep -q "MY_BLOG_TITLE" $CONFIGURATION_FILE; then
1270 1025
           MY_BLOG_TITLE=$(grep "MY_BLOG_TITLE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1271 1026
       fi
@@ -6240,7 +5995,6 @@ function add_ddns_domain {
6240 5995
 
6241 5996
   # clear the arguments
6242 5997
   CURRENT_DDNS_DOMAIN=
6243
-  CURRENT_DDNS_CODE=
6244 5998
 }
6245 5999
 
6246 6000
 function install_owncloud {
@@ -6271,7 +6025,6 @@ function install_owncloud {
6271 6025
   # if this is exclusively a cloud setup
6272 6026
   if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
6273 6027
       OWNCLOUD_DOMAIN_NAME=$DOMAIN_NAME
6274
-      OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE
6275 6028
   fi
6276 6029
   if [ ! $OWNCLOUD_DOMAIN_NAME ]; then
6277 6030
       return
@@ -6462,7 +6215,6 @@ quit" > $INSTALL_DIR/batch.sql
6462 6215
 
6463 6216
   # update the dynamic DNS
6464 6217
   CURRENT_DDNS_DOMAIN=$OWNCLOUD_DOMAIN_NAME
6465
-  CURRENT_DDNS_CODE=$OWNCLOUD_FREEDNS_SUBDOMAIN_CODE
6466 6218
   add_ddns_domain
6467 6219
 
6468 6220
   echo 'install_owncloud' >> $COMPLETION_FILE
@@ -6698,7 +6450,6 @@ function install_wiki {
6698 6450
   # if everything is being installed or if this is exclusively a writer setup
6699 6451
   if [[ $SYSTEM_TYPE == "$VARIANT_FULL" || $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then
6700 6452
       WIKI_DOMAIN_NAME=$DOMAIN_NAME
6701
-      WIKI_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE
6702 6453
   fi
6703 6454
   if [ ! $WIKI_DOMAIN_NAME ]; then
6704 6455
       return
@@ -6940,7 +6691,6 @@ function install_wiki {
6940 6691
 
6941 6692
   # update the dynamic DNS
6942 6693
   CURRENT_DDNS_DOMAIN=$WIKI_DOMAIN_NAME
6943
-  CURRENT_DDNS_CODE=$WIKI_FREEDNS_SUBDOMAIN_CODE
6944 6694
   add_ddns_domain
6945 6695
 
6946 6696
   # add some post-install instructions
@@ -7201,7 +6951,6 @@ function install_blog {
7201 6951
 
7202 6952
   # update the dynamic DNS
7203 6953
   CURRENT_DDNS_DOMAIN=$FULLBLOG_DOMAIN_NAME
7204
-  CURRENT_DDNS_CODE=$FULLBLOG_FREEDNS_SUBDOMAIN_CODE
7205 6954
   add_ddns_domain
7206 6955
 
7207 6956
   echo 'install_blog' >> $COMPLETION_FILE
@@ -7276,7 +7025,6 @@ quit" > $INSTALL_DIR/batch.sql
7276 7025
 
7277 7026
   # update the dynamic DNS
7278 7027
   CURRENT_DDNS_DOMAIN=$MICROBLOG_DOMAIN_NAME
7279
-  CURRENT_DDNS_CODE=$MICROBLOG_FREEDNS_SUBDOMAIN_CODE
7280 7028
   add_ddns_domain
7281 7029
 
7282 7030
   echo 'server {' > /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
@@ -7459,7 +7207,6 @@ function install_redmatrix {
7459 7207
   # if this is exclusively a social setup
7460 7208
   if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then
7461 7209
       REDMATRIX_DOMAIN_NAME=$DOMAIN_NAME
7462
-      REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE
7463 7210
   fi
7464 7211
   if [ ! $REDMATRIX_DOMAIN_NAME ]; then
7465 7212
       return
@@ -7517,7 +7264,6 @@ quit" > $INSTALL_DIR/batch.sql
7517 7264
 
7518 7265
   # update the dynamic DNS
7519 7266
   CURRENT_DDNS_DOMAIN=$REDMATRIX_DOMAIN_NAME
7520
-  CURRENT_DDNS_CODE=$REDMATRIX_FREEDNS_SUBDOMAIN_CODE
7521 7267
   add_ddns_domain
7522 7268
 
7523 7269
   echo 'server {' > /etc/nginx/sites-available/$REDMATRIX_DOMAIN_NAME
@@ -7820,7 +7566,6 @@ function install_mediagoblin {
7820 7566
   # if this is exclusively a writer setup
7821 7567
   if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then
7822 7568
       MEDIAGOBLIN_DOMAIN_NAME=$DOMAIN_NAME
7823
-      MEDIAGOBLIN_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE
7824 7569
   fi
7825 7570
   if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then
7826 7571
       return
@@ -7859,7 +7604,6 @@ function install_mediagoblin {
7859 7604
 
7860 7605
   # update the dynamic DNS
7861 7606
   CURRENT_DDNS_DOMAIN=$MEDIAGOBLIN_DOMAIN_NAME
7862
-  CURRENT_DDNS_CODE=$MEDIAGOBLIN_FREEDNS_SUBDOMAIN_CODE
7863 7607
   add_ddns_domain
7864 7608
 
7865 7609
   # see https://wiki.mediagoblin.org/Deployment / uwsgi with configs