From 545813bdaab3eb0084f0b03b7dd97f889c2528e4 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 20 Jan 2015 11:58:25 +0000 Subject: [PATCH] Remove subdomain codes --- README.md | 10 +- doc/installation.org | 12 +- man/freedombone.1.gz | Bin 3728 -> 3488 bytes src/freedombone | 322 +++++-------------------------------------- 4 files changed, 35 insertions(+), 309 deletions(-) diff --git a/README.md b/README.md index 1fad4d76..313d8db0 100644 --- a/README.md +++ b/README.md @@ -114,14 +114,6 @@ Add the following, and set the values as needed. 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. -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. - - FULLBLOG_FREEDNS_SUBDOMAIN_CODE= - REDMATRIX_FREEDNS_SUBDOMAIN_CODE= - MICROBLOG_FREEDNS_SUBDOMAIN_CODE= - OWNCLOUD_FREEDNS_SUBDOMAIN_CODE= - WIKI_FREEDNS_SUBDOMAIN_CODE= - Save the configuration file and exit from your editor. 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. freedombone -d [default domain name] -u [username] --ddns [dynamic DNS provider domain] --ddnsuser [dynamic DNS username] --ddnspass [dynamic DNS password] -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. +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. 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. diff --git a/doc/installation.org b/doc/installation.org index 5567c25c..8a582cbe 100644 --- a/doc/installation.org +++ b/doc/installation.org @@ -118,16 +118,6 @@ ROUTER_IP_ADDRESS= 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. -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. - -#+BEGIN_SRC bash -FULLBLOG_FREEDNS_SUBDOMAIN_CODE= -REDMATRIX_FREEDNS_SUBDOMAIN_CODE= -MICROBLOG_FREEDNS_SUBDOMAIN_CODE= -OWNCLOUD_FREEDNS_SUBDOMAIN_CODE= -WIKI_FREEDNS_SUBDOMAIN_CODE= -#+END_SRC - Save the configuration file and exit from your editor. 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. freedombone -d [default domain name] -u [username] --ddns [dynamic DNS provider domain] --ddnsuser [dynamic DNS username] --ddnspass [dynamic DNS password] #+END_SRC -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. +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. 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. diff --git a/man/freedombone.1.gz b/man/freedombone.1.gz index 0bd9d32801657660a5ec8c4c27bbc588860983f6..2486e1646e4355f632db83b51c62112a178d52f1 100644 GIT binary patch literal 3488 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 OYWxQvNOsL1BLD!S^46*V literal 3728 zcmV;B4sY=viwFSFAG}lm1I=1na~ek$e&<(o@#0;tK$c@Wl4`TNAYq9Z0R5=uOS#$z|1({xt)S6{8(7OUx0IA?dV$`FBsDS%B9lByeAgyett_E#QL7b( zVeM$qx66`rAyg{5GFYr6)81VL(Ss!_$3`N(wvi+#j4JLCW(gr#jsk7>#n@-r_x4@N zd62J+a1$gByINzlJHTVTl2OG(QWpv%ii>2 z(jU+IqhYf#Tgpbe>qm!1q}J;ojSDN*e0LB+W@hJm)&SyIZ&uPsES0Sy1VMp*WOA-k zrPvvyI|x5oCh+6i1e^tQG1TV=1(Nlp3=_o2?;)H-wng8FEkL2NWRav;w-Zq&1B07L zG{6kS2%>U7PKasu;z)$K5s6M;8EAZ+&^FLwmVtqP%HW{$Rgj5gkj2{|!)*{r28QX6 zn9D7&1u960k3j~ijBb;)z7`*I2*FW)UIZ*HD&gl)ytj(3MOQ3>QSR<Kf;sXmJ3G3ae47;l zv~>vk3qCMvg|BnS|A2Ykj9@wHZg=~Yjt6s ztV|1fF3>45oTJvx)ro~nkyshfNj?(@OHHOWJLfaoLUaI8vgbTaBDOAVwakaBCq}s} zr5f&_7#oeDHwc23Ws(jcjM@G34EHaM+354*<4_vtj`yp!$`))rKxrnoFvu0zOq!Eb#LQk{^_As(tCh)V{1cZg8h7=Z4hBU7{Xju@G`sU=JbRPa(u4GHH z^~45H1e$=%W$-J!jCMD0e3TSrU_vcO2W4rpCZj|Mv>F$jTHtH6lyF>I+ToR3v69Yy zX@Z1^0gA#P+6J$bEX^cy#PXc-F4#sBcdRJLHldBLBquhWqo&LmynzUj8Du-k6+kFK zhQ^=`0n8>F!(fJUAQ%v2k8_m2mv}dXoLv~8bUvf#> zbKahv6&*ow<-rD%D%@*0Ptd}A8{ciZ-?gHiv7p65DNc|HgeqUb;guPSHB#7L2KBoL z;E*+*^v0bD+n)G1nuu<%b2aF7N5h`z4muZ~3WI!wV^UQ@-&Wr&lV@S7W}^B5wJ#$U z*IVB)BHp)&rbN)%IP|t5;|3h}wAw=cxM^72EnvFv=h6ZXAf+Y)r4v|Ub22WFrkA)l ziwg!Xu6q}s2K_0_r)%+^;zpBtWucXXCVxbLaytfY+2FL;7W^ ziiMB@0zvHJC`auB{e!}9l-&p%WqtG3**Q>(*g$@$mN1eq%2KsLLnYGbbRZ&${CZ9? zUQ#BI!N?J1Viz;aQt48A94EQdsn%gA5*DwT((DwP&eyM zIv2D44?QvM&2GnBX4Sf2huU@|>728fGUaj=&YCh~x>f zalPhWN3}%3HbnkAtlD+?|1Cle$qkVIM4CFmaL4m3378__3_Ie-NESUe%7B2 z_J*dnU2pW`?O?#emm?fG^pEIYOh$*NCcVp>&TP{E@%hx~Zg?>m-CjPQx$A%GzcA|2 z(;IfWgWf&2lfFw8j}1l_ox%OEH@h26KHVeBpY<AY2|A&qXi${!#S4HnS64;Wm+S>bDASoG zQDe)*qGQVq%J@*jyOtFN`|u%?;!^Xu1sxUHpe47+GPq1(hy@#5vVkW;1G`+R?wWbibn}3%M%_R*gD_KTdi*+)og9K)V=SKEv$SR#l+?+Nu)dUt7e;erZ8t zS`?;-{3sRRPw-KkQ?Wj6vCy_rs!)H3^e}bM@~dhORow=Hsk)cdaQ~Ey>zt~l^McmS<`Dkm0)sBNcqDH7H?BlT^Td=u~~p~*CVxw zF&V$jE38N$BHPlgyrDnsB$nukCU*eIc5X}Bj616}C_eLWeCUflj{97NgKI^?YLn}Q zjf|4{uJRfO@_x_5ResiDrPv;nc^5shR$a?Ey#SQgaq5Lk+BI&Awn&+@lq_ft2s3=SC(R9{wdES&0{NnxBmH=K0sw@VJgf>GO z`bZ*heKBood?VOr+hin`8x#uKw(p)NtkF^_ZG9H&y^L}phPFv;mThVh!)*cK1ga&q z3?YWhw$o7!o!a(Wo_b3)b>$B3oEvY-(3*THFvrK@EIz_1*}b^2qe-zT+w;I z-~0x5zh(gyad)K2n655+6a2nZEA|*o=Ld3DXFRQqc#97bKz^{I+?vvD>co5OxN;3c zSsuA2cJ<_~i?;7v<+ek#mw8Tloy(h^HGhXY+n8l1P#xnc_rO%qhr8LtkL85lfr<@8 zFQAf@?=hdGq`4p4ob=a0U{f7Gv9jqx*@-GzR7bEl7w4;Nrs~iay#^+!NOCN|orC{P zOl>~|-|WjKZ~o0rwu;YRTHeP^itE{IY`+zs(>KDOocfdR-hER}PGN!mPSR>Q$q!ZD z z44-oHDlzrRcPFRiWY4`oSK@p7{^iN{r{BIj`R>D4cAlM)5S-WROs6OZE~m}LxI(hZ zO0T!stjedK%CrGMXVtE;TC*XC^@DaKf_YJZI~%9BIr3dQKN@((#-?UlP?fQ{4)DG) z9UZbJX0&^I1s*4o{{cdnFTjnV9Ou8PT#pm2Q9+jN|Jn6u(nMJliW_AN9GduRsKS3_ zDpV$kbUS}&8}+wFJIos6tMT#G`08BrI%lVEd*7V$Xg4uydOlmobJ4wNy^Zej<+}U$ uLp;x}mjm_BS*$k~51(W*Q`xQ5(*f_gli@iN40`K#HU0xdnrgSeCIA2}SVK+# diff --git a/src/freedombone b/src/freedombone index 08180598..e3a90105 100755 --- a/src/freedombone +++ b/src/freedombone @@ -30,60 +30,11 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# -# Summary -# ======= -# -# This script is intended to be run on the target device, which -# is typically a Beaglebone Black. -# -# To be able to run this script you need to get to a condition -# where you have Debian Jessie installed, with at least one -# unprivileged user account and at least one subdomain created on -# https://freedns.afraid.org/. If you're not installing on a -# Beaglebone Black then set the variable INSTALLING_ON_BBB to "no" -# -# Note on dynamic dns -# =================== -# -# I'm not particularly trying to promote freedns.afraid.org -# as a service, it just happens to be a dynamic DNS system which -# provides free (as in beer) accounts, and I'm trying to make the -# process of setting up a working server as trivial as possible. -# Other dynamic DNS systems are available, and if you're using -# something different then comment out the section within -# argument_checks and the call to dynamic_dns_freedns. -# -# Prerequisites -# ============= -# -# You will need to initially prepare a microSD card with a Debian -# image on it. This can be done using the initial_setup.sh script. -# -# If you are not using a Beaglebone Black then just prepare the -# target system with a fresh installation of Debian Jessie. -# -# Configuration file -# ================== -# If you don't want to edit this script directly then you can -# create a configuration file called freedombone.cfg, which should -# be in the same directory as install-freedombone.sh. -# Within the configuration file you can specify the main settings -# such as: -# -# INSTALLING_ON_BBB=yes -# SSH_PORT=2222 -# MICROBLOG_DOMAIN_NAME=mydomain -# MICROBLOG_FREEDNS_SUBDOMAIN_CODE=[code] -# ... -# -# Note that there are no spaces around the equals. NO_OF_ARGS=$# DOMAIN_NAME= MY_USERNAME= -FREEDNS_SUBDOMAIN_CODE= SYSTEM_TYPE= # Are we installing on a Beaglebone Black (BBB) or some other system? @@ -114,7 +65,6 @@ DDNS_PROVIDER="default@freedns.afraid.org" DDNS_USERNAME= DDNS_PASSWORD= CURRENT_DDNS_DOMAIN= -CURRENT_DDNS_CODE= # Minimum number of characters in a password MINIMUM_PASSWORD_LENGTH=10 @@ -163,39 +113,33 @@ PUBLIC_MAILING_LIST_DIRECTORY="/var/spool/mlmmj" # There should be no spaces in the name PRIVATE_MAILING_LIST= -# Domain name or freedns subdomain for mediagoblin installation +# Domain name for mediagoblin installation MEDIAGOBLIN_DOMAIN_NAME= -MEDIAGOBLIN_FREEDNS_SUBDOMAIN_CODE= MEDIAGOBLIN_REPO="" MEDIAGOBLIN_ADMIN_PASSWORD= -# Domain name or freedns subdomain for microblog installation +# Domain name for microblog installation MICROBLOG_DOMAIN_NAME= -MICROBLOG_FREEDNS_SUBDOMAIN_CODE= MICROBLOG_REPO="git://gitorious.org/social/mainline.git" MICROBLOG_ADMIN_PASSWORD= # Domain name or redmatrix installation REDMATRIX_DOMAIN_NAME= -REDMATRIX_FREEDNS_SUBDOMAIN_CODE= REDMATRIX_REPO="https://github.com/friendica/red.git" REDMATRIX_ADDONS_REPO="https://github.com/friendica/red-addons.git" REDMATRIX_ADMIN_PASSWORD= -# Domain name and freedns subdomain for Owncloud installation +# Domain name for Owncloud installation OWNCLOUD_DOMAIN_NAME= -OWNCLOUD_FREEDNS_SUBDOMAIN_CODE= OWNCLOUD_ADMIN_PASSWORD= -# Domain name and freedns subdomain for your wiki +# Domain name for your wiki WIKI_DOMAIN_NAME= -WIKI_FREEDNS_SUBDOMAIN_CODE= WIKI_ADMIN_PASSWORD= WIKI_TITLE="Freedombone Wiki" -# Domain name and freedns subdomain for your blog +# Domain name for your blog FULLBLOG_DOMAIN_NAME= -FULLBLOG_FREEDNS_SUBDOMAIN_CODE= MY_BLOG_TITLE="My Blog" MY_BLOG_SUBTITLE="Another Freedombone Blog" @@ -340,7 +284,7 @@ CJDNS_PORT= function show_help { echo '' - echo 'freedombone -d [domain] -u [username] -c [FreeDNS subdomain code] -s [system type]' + echo 'freedombone -d [domain] -u [username] -s [system type]' echo '' echo ' -h --help Show help' echo ' menuconfig Easy interactive installation' @@ -354,13 +298,6 @@ function show_help { echo ' --ddnsuser Dynamic DNS provider username' echo ' --ddnspass Dynamic DNS provider password' echo '' - echo ' -c --code Default domain FreeDNS code' - echo ' --microblogcode Microblog FreeDNS code' - echo ' --wikicode Wiki FreeDNS code' - echo ' --owncloudcode Owncloud FreeDNS code' - echo ' --redmatrixcode Redmatrix FreeDNS code' - echo ' --blogcode Blog FreeDNS code' - echo '' echo ' --microblogdomain Microblog domain name' echo ' --wikidomain Wiki domain name' echo ' --blogdomain Blog domain name' @@ -457,39 +394,21 @@ function save_configuration_file { if [ $WIKI_DOMAIN_NAME ]; then echo "WIKI_DOMAIN_NAME=$WIKI_DOMAIN_NAME" >> freedombone.cfg fi - if [ $WIKI_FREEDNS_SUBDOMAIN_CODE ]; then - echo "WIKI_FREEDNS_SUBDOMAIN_CODE=$WIKI_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg - fi - if [ $FREEDNS_SUBDOMAIN_CODE ]; then - echo "FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg - fi if [ $MY_BLOG_TITLE ]; then echo "MY_BLOG_TITLE=$MY_BLOG_TITLE" >> freedombone.cfg fi if [ $FULLBLOG_DOMAIN_NAME ]; then echo "FULLBLOG_DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME" >> freedombone.cfg fi - if [ $FULLBLOG_FREEDNS_SUBDOMAIN_CODE ]; then - echo "FULLBLOG_FREEDNS_SUBDOMAIN_CODE=$FULLBLOG_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg - fi if [ $OWNCLOUD_DOMAIN_NAME ]; then echo "OWNCLOUD_DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME" >> freedombone.cfg fi - if [ $OWNCLOUD_FREEDNS_SUBDOMAIN_CODE ]; then - echo "OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$OWNCLOUD_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg - fi if [ $REDMATRIX_DOMAIN_NAME ]; then echo "REDMATRIX_DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME" >> freedombone.cfg fi - if [ $REDMATRIX_FREEDNS_SUBDOMAIN_CODE ]; then - echo "REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$REDMATRIX_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg - fi if [ $MICROBLOG_DOMAIN_NAME ]; then echo "MICROBLOG_DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME" >> freedombone.cfg fi - if [ $MICROBLOG_FREEDNS_SUBDOMAIN_CODE ]; then - echo "MICROBLOG_FREEDNS_SUBDOMAIN_CODE=$MICROBLOG_FREEDNS_SUBDOMAIN_CODE" >> freedombone.cfg - fi } function interactive_configuration { @@ -675,22 +594,12 @@ function interactive_configuration { do data=$(tempfile 2>/dev/null) trap "rm -f $data" 0 1 2 5 15 - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - dialog --backtitle "Freedombone Configuration" \ - --title "Wiki Configuration" \ - --form "\nPlease enter your wiki details:" 11 55 4 \ - "Title:" 1 1 "My Wiki" 1 16 16 15 \ - "Domain:" 2 1 "" 2 16 16 15 \ - "FreeDNS code:" 3 1 "" 3 16 16 15 \ - 2> $data - else - dialog --backtitle "Freedombone Configuration" \ - --title "Wiki Configuration" \ - --form "\nPlease enter your wiki details:" 11 55 3 \ - "Title:" 1 1 "My Wiki" 1 16 16 15 \ - "Domain:" 2 1 "" 2 16 16 15 \ - 2> $data - fi + dialog --backtitle "Freedombone Configuration" \ + --title "Wiki Configuration" \ + --form "\nPlease enter your wiki details:" 11 55 3 \ + "Title:" 1 1 "My Wiki" 1 16 16 15 \ + "Domain:" 2 1 "" 2 16 16 15 \ + 2> $data sel=$? case $sel in 1) exit 0;; @@ -702,16 +611,6 @@ function interactive_configuration { if [ ! $DOMAIN_NAME ]; then DOMAIN_NAME=$WIKI_DOMAIN_NAME fi - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - WIKI_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 3p) - if [ ! $WIKI_FREEDNS_SUBDOMAIN_CODE ]; then - WIKI_DOMAIN_NAME="" - else - if [[ $DOMAIN_NAME == "$WIKI_DOMAIN_NAME" ]]; then - FREEDNS_SUBDOMAIN_CODE=$WIKI_FREEDNS_SUBDOMAIN_CODE - fi - fi - fi fi done fi @@ -721,22 +620,12 @@ function interactive_configuration { do data=$(tempfile 2>/dev/null) trap "rm -f $data" 0 1 2 5 15 - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - dialog --backtitle "Freedombone Configuration" \ - --title "Blog Configuration" \ - --form "\nPlease enter your blog details:" 11 55 4 \ - "Title:" 1 1 "My Blog" 1 16 16 15 \ - "Domain:" 2 1 "" 2 16 16 15 \ - "FreeDNS code:" 3 1 "" 3 16 16 15 \ - 2> $data - else - dialog --backtitle "Freedombone Configuration" \ - --title "Blog Configuration" \ - --form "\nPlease enter your blog details:" 11 55 3 \ - "Title:" 1 1 "My Blog" 1 16 16 15 \ - "Domain:" 2 1 "" 2 16 16 15 \ - 2> $data - fi + dialog --backtitle "Freedombone Configuration" \ + --title "Blog Configuration" \ + --form "\nPlease enter your blog details:" 11 55 3 \ + "Title:" 1 1 "My Blog" 1 16 16 15 \ + "Domain:" 2 1 "" 2 16 16 15 \ + 2> $data sel=$? case $sel in 1) exit 0;; @@ -751,16 +640,6 @@ function interactive_configuration { if [ ! $DOMAIN_NAME ]; then DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME fi - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - FULLBLOG_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 3p) - if [ ! $FULLBLOG_FREEDNS_SUBDOMAIN_CODE ]; then - FULLBLOG_DOMAIN_NAME="" - else - if [[ $DOMAIN_NAME == "$FULLBLOG_DOMAIN_NAME" ]]; then - FREEDNS_SUBDOMAIN_CODE=$FULLBLOG_FREEDNS_SUBDOMAIN_CODE - fi - fi - fi fi done fi @@ -770,20 +649,11 @@ function interactive_configuration { do data=$(tempfile 2>/dev/null) trap "rm -f $data" 0 1 2 5 15 - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - dialog --backtitle "Freedombone Configuration" \ - --title "Owncloud Configuration" \ - --form "\nPlease enter your Owncloud details:" 11 55 3 \ - "Domain:" 1 1 "" 1 16 16 15 \ - "FreeDNS code:" 2 1 "" 2 16 16 15 \ - 2> $data - else - dialog --backtitle "Freedombone Configuration" \ - --title "Owncloud Configuration" \ - --form "\nPlease enter your Owncloud details:" 11 55 3 \ - "Domain:" 1 1 "" 1 16 16 15 \ - 2> $data - fi + dialog --backtitle "Freedombone Configuration" \ + --title "Owncloud Configuration" \ + --form "\nPlease enter your Owncloud details:" 11 55 3 \ + "Domain:" 1 1 "" 1 16 16 15 \ + 2> $data sel=$? case $sel in 1) exit 0;; @@ -794,16 +664,6 @@ function interactive_configuration { if [ ! $DOMAIN_NAME ]; then DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME fi - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p) - if [ ! $OWNCLOUD_FREEDNS_SUBDOMAIN_CODE ]; then - OWNCLOUD_DOMAIN_NAME="" - else - if [[ $DOMAIN_NAME == "$OWNCLOUD_DOMAIN_NAME" ]]; then - FREEDNS_SUBDOMAIN_CODE=$OWNCLOUD_FREEDNS_SUBDOMAIN_CODE - fi - fi - fi fi done fi @@ -813,20 +673,11 @@ function interactive_configuration { do data=$(tempfile 2>/dev/null) trap "rm -f $data" 0 1 2 5 15 - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - dialog --backtitle "Freedombone Configuration" \ - --title "RedMatrix Configuration" \ - --form "\nPlease enter your RedMatrix details:" 11 55 3 \ - "Domain:" 1 1 "" 1 16 16 15 \ - "FreeDNS code:" 2 1 "" 2 16 16 15 \ - 2> $data - else - dialog --backtitle "Freedombone Configuration" \ - --title "RedMatrix Configuration" \ - --form "\nPlease enter your RedMatrix details:" 11 55 3 \ - "Domain:" 1 1 "" 1 16 16 15 \ - 2> $data - fi + dialog --backtitle "Freedombone Configuration" \ + --title "RedMatrix Configuration" \ + --form "\nPlease enter your RedMatrix details:" 11 55 3 \ + "Domain:" 1 1 "" 1 16 16 15 \ + 2> $data sel=$? case $sel in 1) exit 0;; @@ -837,16 +688,6 @@ function interactive_configuration { if [ ! $DOMAIN_NAME ]; then DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME fi - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p) - if [ ! $REDMATRIX_FREEDNS_SUBDOMAIN_CODE ]; then - REDMATRIX_DOMAIN_NAME="" - else - if [[ $DOMAIN_NAME == "$REDMATRIX_DOMAIN_NAME" ]]; then - FREEDNS_SUBDOMAIN_CODE=$REDMATRIX_FREEDNS_SUBDOMAIN_CODE - fi - fi - fi fi done fi @@ -856,20 +697,11 @@ function interactive_configuration { do data=$(tempfile 2>/dev/null) trap "rm -f $data" 0 1 2 5 15 - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - dialog --backtitle "Freedombone Configuration" \ - --title "Microblog Configuration" \ - --form "\nPlease enter your Microblog details:" 11 55 3 \ - "Domain:" 1 1 "" 1 16 16 15 \ - "FreeDNS code:" 2 1 "" 2 16 16 15 \ - 2> $data - else - dialog --backtitle "Freedombone Configuration" \ - --title "Microblog Configuration" \ - --form "\nPlease enter your Microblog details:" 11 55 3 \ - "Domain:" 1 1 "" 1 16 16 15 \ - 2> $data - fi + dialog --backtitle "Freedombone Configuration" \ + --title "Microblog Configuration" \ + --form "\nPlease enter your Microblog details:" 11 55 3 \ + "Domain:" 1 1 "" 1 16 16 15 \ + 2> $data sel=$? case $sel in 1) exit 0;; @@ -883,16 +715,6 @@ function interactive_configuration { if [ ! $DOMAIN_NAME ]; then DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME fi - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - MICROBLOG_FREEDNS_SUBDOMAIN_CODE=$(cat $data | sed -n 2p) - if [ ! $MICROBLOG_FREEDNS_SUBDOMAIN_CODE ]; then - MICROBLOG_DOMAIN_NAME="" - else - if [[ $DOMAIN_NAME == "$MICROBLOG_DOMAIN_NAME" ]]; then - FREEDNS_SUBDOMAIN_CODE=$MICROBLOG_FREEDNS_SUBDOMAIN_CODE - fi - fi - fi fi done fi @@ -911,22 +733,6 @@ function interactive_configuration { 255) exit 0;; esac done - - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - while [ ! $FREEDNS_SUBDOMAIN_CODE ] - do - data=$(tempfile 2>/dev/null) - trap "rm -f $data" 0 1 2 5 15 - dialog --backtitle "Freedombone Configuration" \ - --inputbox "FreeDNS subdomain code" 10 30 2> $data - sel=$? - case $sel in - 0) FREEDNS_SUBDOMAIN_CODE=$(cat $data);; - 1) exit 0;; - 255) exit 0;; - esac - done - fi fi while [ ! $MY_EMAIL_ADDRESS ] @@ -980,61 +786,31 @@ case $key in shift MICROBLOG_DOMAIN_NAME="$1" ;; - # microblog domain code (freedns) - --microblogcode) - shift - MICROBLOG_FREEDNS_SUBDOMAIN_CODE="$1" - ;; # wiki domain name --wikidomain) shift WIKI_DOMAIN_NAME="$1" ;; - # wiki domain code (freedns) - --wikicode) - shift - WIKI_FREEDNS_SUBDOMAIN_CODE="$1" - ;; # blog domain name --blogdomain) shift FULLBLOG_DOMAIN_NAME="$1" ;; - # blog domain code (freedns) - --blogcode) - shift - FULLBLOG_FREEDNS_SUBDOMAIN_CODE="$1" - ;; # owncloud domain name --ownclouddomain) shift OWNCLOUD_DOMAIN_NAME="$1" ;; - # owncloud domain code (freedns) - --owncloudcode) - shift - OWNCLOUD_FREEDNS_SUBDOMAIN_CODE="$1" - ;; # redmatrix domain name --redmatrixdomain) shift REDMATRIX_DOMAIN_NAME="$1" ;; - # redmatrix domain code (freedns) - --redmatrixcode) - shift - REDMATRIX_FREEDNS_SUBDOMAIN_CODE="$1" - ;; # default domain name -d|--domain) shift DOMAIN_NAME="$1" ;; - # default domain code (freedns) - -c|--code) - shift - FREEDNS_SUBDOMAIN_CODE="$1" - ;; # The type of system -s|--system) shift @@ -1143,12 +919,6 @@ function parse_args { echo 'Please provide the password for your dynamic DNS provider with the --ddnspass option' exit 6382 fi - if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then - if [ ! $FREEDNS_SUBDOMAIN_CODE ]; then - show_help - exit 4 - fi - fi if [ ! $SYSTEM_TYPE ]; then SYSTEM_TYPE=$VARIANT_FULL fi @@ -1239,33 +1009,18 @@ function read_configuration { if grep -q "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then MICROBLOG_DOMAIN_NAME=$(grep "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi - if grep -q "MICROBLOG_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then - MICROBLOG_FREEDNS_SUBDOMAIN_CODE=$(grep "MICROBLOG_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}') - fi if grep -q "REDMATRIX_DOMAIN_NAME" $CONFIGURATION_FILE; then REDMATRIX_DOMAIN_NAME=$(grep "REDMATRIX_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi - if grep -q "REDMATRIX_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then - REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$(grep "REDMATRIX_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}') - fi if grep -q "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE; then OWNCLOUD_DOMAIN_NAME=$(grep "OWNCLOUD_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi - if grep -q "OWNCLOUD_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then - OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$(grep "OWNCLOUD_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}') - fi if grep -q "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE; then WIKI_DOMAIN_NAME=$(grep "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi - if grep -q "WIKI_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then - WIKI_FREEDNS_SUBDOMAIN_CODE=$(grep "WIKI_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}') - fi if grep -q "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then FULLBLOG_DOMAIN_NAME=$(grep "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi - if grep -q "FULLBLOG_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE; then - FULLBLOG_FREEDNS_SUBDOMAIN_CODE=$(grep "FULLBLOG_FREEDNS_SUBDOMAIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}') - fi if grep -q "MY_BLOG_TITLE" $CONFIGURATION_FILE; then MY_BLOG_TITLE=$(grep "MY_BLOG_TITLE" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi @@ -6240,7 +5995,6 @@ function add_ddns_domain { # clear the arguments CURRENT_DDNS_DOMAIN= - CURRENT_DDNS_CODE= } function install_owncloud { @@ -6271,7 +6025,6 @@ function install_owncloud { # if this is exclusively a cloud setup if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then OWNCLOUD_DOMAIN_NAME=$DOMAIN_NAME - OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE fi if [ ! $OWNCLOUD_DOMAIN_NAME ]; then return @@ -6462,7 +6215,6 @@ quit" > $INSTALL_DIR/batch.sql # update the dynamic DNS CURRENT_DDNS_DOMAIN=$OWNCLOUD_DOMAIN_NAME - CURRENT_DDNS_CODE=$OWNCLOUD_FREEDNS_SUBDOMAIN_CODE add_ddns_domain echo 'install_owncloud' >> $COMPLETION_FILE @@ -6698,7 +6450,6 @@ function install_wiki { # if everything is being installed or if this is exclusively a writer setup if [[ $SYSTEM_TYPE == "$VARIANT_FULL" || $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then WIKI_DOMAIN_NAME=$DOMAIN_NAME - WIKI_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE fi if [ ! $WIKI_DOMAIN_NAME ]; then return @@ -6940,7 +6691,6 @@ function install_wiki { # update the dynamic DNS CURRENT_DDNS_DOMAIN=$WIKI_DOMAIN_NAME - CURRENT_DDNS_CODE=$WIKI_FREEDNS_SUBDOMAIN_CODE add_ddns_domain # add some post-install instructions @@ -7201,7 +6951,6 @@ function install_blog { # update the dynamic DNS CURRENT_DDNS_DOMAIN=$FULLBLOG_DOMAIN_NAME - CURRENT_DDNS_CODE=$FULLBLOG_FREEDNS_SUBDOMAIN_CODE add_ddns_domain echo 'install_blog' >> $COMPLETION_FILE @@ -7276,7 +7025,6 @@ quit" > $INSTALL_DIR/batch.sql # update the dynamic DNS CURRENT_DDNS_DOMAIN=$MICROBLOG_DOMAIN_NAME - CURRENT_DDNS_CODE=$MICROBLOG_FREEDNS_SUBDOMAIN_CODE add_ddns_domain echo 'server {' > /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME @@ -7459,7 +7207,6 @@ function install_redmatrix { # if this is exclusively a social setup if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then REDMATRIX_DOMAIN_NAME=$DOMAIN_NAME - REDMATRIX_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE fi if [ ! $REDMATRIX_DOMAIN_NAME ]; then return @@ -7517,7 +7264,6 @@ quit" > $INSTALL_DIR/batch.sql # update the dynamic DNS CURRENT_DDNS_DOMAIN=$REDMATRIX_DOMAIN_NAME - CURRENT_DDNS_CODE=$REDMATRIX_FREEDNS_SUBDOMAIN_CODE add_ddns_domain echo 'server {' > /etc/nginx/sites-available/$REDMATRIX_DOMAIN_NAME @@ -7820,7 +7566,6 @@ function install_mediagoblin { # if this is exclusively a writer setup if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then MEDIAGOBLIN_DOMAIN_NAME=$DOMAIN_NAME - MEDIAGOBLIN_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE fi if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then return @@ -7859,7 +7604,6 @@ function install_mediagoblin { # update the dynamic DNS CURRENT_DDNS_DOMAIN=$MEDIAGOBLIN_DOMAIN_NAME - CURRENT_DDNS_CODE=$MEDIAGOBLIN_FREEDNS_SUBDOMAIN_CODE add_ddns_domain # see https://wiki.mediagoblin.org/Deployment / uwsgi with configs