From 49f427b8e412dbc1d830e814bfa61ef7f9ff9157 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 3 Feb 2015 20:52:38 +0000 Subject: [PATCH] Moving to an independent default domain name --- doc/EN/installation.org | 4 +- man/freedombone.1.gz | Bin 3795 -> 3835 bytes src/freedombone | 73 +++++++++++++++-------------------- src/freedombone-config | 32 +++------------ website/EN/installation.html | 6 +-- 5 files changed, 43 insertions(+), 72 deletions(-) diff --git a/doc/EN/installation.org b/doc/EN/installation.org index 9ce66a73..ca69d61c 100644 --- a/doc/EN/installation.org +++ b/doc/EN/installation.org @@ -101,11 +101,11 @@ make install nano /home/myusername/freedombone/freedombone.cfg #+END_SRC -Add the following, and set the values as needed. Note that for a full install DOMAIN_NAME should be the same as the wiki domain name. +Add the following, and set the values as needed. DEFAULT_DOMAIN_NAME is where your email/xmpp/irc/voip will be accessed from. It could be the same as one of your other domains, or separate. #+BEGIN_SRC bash MY_USERNAME=myusername -DOMAIN_NAME=mywikidomain +DEFAULT_DOMAIN_NAME=mywikidomain SYSTEM_TYPE=full INSTALLING_ON_BBB=no DDNS_PROVIDER=default@freedns.afraid.org diff --git a/man/freedombone.1.gz b/man/freedombone.1.gz index 7e29221a64cd0e9fd223723e375470ecf4014c9f..6a988692c4452aff9f825b76dca49d141992b04e 100644 GIT binary patch literal 3835 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 literal 3795 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 Jd-w_`007(?X+;14 diff --git a/src/freedombone b/src/freedombone index fb290272..da58217c 100755 --- a/src/freedombone +++ b/src/freedombone @@ -54,7 +54,7 @@ VARIANT_SOCIAL="social" VARIANT_MEDIA="media" VARIANT_TOR_DONGLE="tordongle" -DOMAIN_NAME= +DEFAULT_DOMAIN_NAME= MY_USERNAME= SYSTEM_TYPE=$VARIANT_FULL @@ -241,10 +241,10 @@ XMPP_CIPHERS='"EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+ XMPP_ECC_CURVE='"secp384r1"' # the default email address -MY_EMAIL_ADDRESS=$MY_USERNAME@$DOMAIN_NAME +MY_EMAIL_ADDRESS=$MY_USERNAME@$DEFAULT_DOMAIN_NAME # optionally specify your name to appear on the blog -MY_NAME=$DOMAIN_NAME +MY_NAME=$DEFAULT_DOMAIN_NAME export DEBIAN_FRONTEND=noninteractive @@ -512,7 +512,7 @@ else # default domain name -d|--domain) shift - DOMAIN_NAME="$1" + DEFAULT_DOMAIN_NAME="$1" ;; # The type of system -s|--system) @@ -632,7 +632,7 @@ function parse_args { echo "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user." exit 1 fi - if [ ! "$DOMAIN_NAME" ]; then + if [ ! "$DEFAULT_DOMAIN_NAME" ]; then echo 'No default domain specified' show_help exit 2 @@ -706,7 +706,11 @@ function read_configuration { MY_USERNAME=$(grep "MY_USERNAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi if grep -q "DOMAIN_NAME" $CONFIGURATION_FILE; then - DOMAIN_NAME=$(grep "DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') + # for backwards compatability + DEFAULT_DOMAIN_NAME=$(grep "DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') + fi + if grep -q "DEFAULT_DOMAIN_NAME" $CONFIGURATION_FILE; then + DEFAULT_DOMAIN_NAME=$(grep "DEFAULT_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}') fi if grep -q "NAMESERVER1" $CONFIGURATION_FILE; then NAMESERVER1=$(grep "NAMESERVER1" $CONFIGURATION_FILE | awk -F '=' '{print $2}') @@ -4269,10 +4273,10 @@ function set_your_domain_name { if grep -Fxq "set_your_domain_name" $COMPLETION_FILE; then return fi - echo "$DOMAIN_NAME" > /etc/hostname - hostname $DOMAIN_NAME - sed -i "s/127.0.1.1 arm/127.0.1.1 $DOMAIN_NAME/g" /etc/hosts - echo "127.0.1.1 $DOMAIN_NAME" >> /etc/hosts + echo "$DEFAULT_DOMAIN_NAME" > /etc/hostname + hostname $DEFAULT_DOMAIN_NAME + sed -i "s/127.0.1.1 arm/127.0.1.1 $DEFAULT_DOMAIN_NAME/g" /etc/hosts + echo "127.0.1.1 $DEFAULT_DOMAIN_NAME" >> /etc/hosts echo 'set_your_domain_name' >> $COMPLETION_FILE } @@ -4727,7 +4731,7 @@ function configure_email { sed -i 's|pam_mail.so nopen|pam_mail.so dir=~/Maildir nopen|g' /etc/pam.d/su echo 'dc_eximconfig_configtype="internet"' > /etc/exim4/update-exim4.conf.conf - echo "dc_other_hostnames='$DOMAIN_NAME'" >> /etc/exim4/update-exim4.conf.conf + echo "dc_other_hostnames='$DEFAULT_DOMAIN_NAME'" >> /etc/exim4/update-exim4.conf.conf echo "dc_local_interfaces=''" >> /etc/exim4/update-exim4.conf.conf echo "dc_readhost=''" >> /etc/exim4/update-exim4.conf.conf echo "dc_relay_domains=''" >> /etc/exim4/update-exim4.conf.conf @@ -4755,7 +4759,7 @@ function configure_email { chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam sed -i '/login_saslauthd_server/,/.endif/ s/# *//' /etc/exim4/exim4.conf.template - sed -i "/.ifdef MAIN_HARDCODE_PRIMARY_HOSTNAME/i\MAIN_HARDCODE_PRIMARY_HOSTNAME = $DOMAIN_NAME\nMAIN_TLS_ENABLE = true" /etc/exim4/exim4.conf.template + sed -i "/.ifdef MAIN_HARDCODE_PRIMARY_HOSTNAME/i\MAIN_HARDCODE_PRIMARY_HOSTNAME = $DEFAULT_DOMAIN_NAME\nMAIN_TLS_ENABLE = true" /etc/exim4/exim4.conf.template sed -i "s|SMTPLISTENEROPTIONS=''|SMTPLISTENEROPTIONS='-oX 465:25:587 -oP /var/run/exim4/exim.pid'|g" /etc/default/exim4 if ! grep -q "tls_on_connect_ports=465" /etc/exim4/exim4.conf.template; then sed -i '/SSL configuration for exim/i\tls_on_connect_ports=465' /etc/exim4/exim4.conf.template @@ -5536,7 +5540,7 @@ function create_public_mailing_list { fi # does the mailing list have a separate domain name? if [ ! $PUBLIC_MAILING_LIST_DOMAIN_NAME ]; then - PUBLIC_MAILING_LIST_DOMAIN_NAME=$DOMAIN_NAME + PUBLIC_MAILING_LIST_DOMAIN_NAME=$DEFAULT_DOMAIN_NAME fi PUBLIC_MAILING_LIST_USER="mlmmj" @@ -5612,7 +5616,7 @@ function create_public_mailing_list { echo 'Public mailing list' >> /home/$MY_USERNAME/README echo '===================' >> /home/$MY_USERNAME/README echo "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a" >> /home/$MY_USERNAME/README - echo "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DOMAIN_NAME" >> /home/$MY_USERNAME/README + echo "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README fi addmailinglist $MY_USERNAME "$PUBLIC_MAILING_LIST" "$PUBLIC_MAILING_LIST" @@ -5651,8 +5655,8 @@ function create_private_mailing_list { ln -s /var/lib/gems/2.1.0/gems/schleuder-2.2.4 /var/lib/schleuder sed -i 's/#smtp_port: 25/smtp_port: 465/g' /etc/schleuder/schleuder.conf sed -i 's/#superadminaddr: root@localhost/superadminaddr: root@localhost' /etc/schleuder/schleuder.conf - schleuder-newlist $PRIVATE_MAILING_LIST@$DOMAIN_NAME -realname "$PRIVATE_MAILING_LIST" -adminaddress $MY_EMAIL_ADDRESS -initmember $MY_EMAIL_ADDRESS -initmemberkey $MY_GPG_PUBLIC_KEY -nointeractive - addemailtofolder $MY_USERNAME $PRIVATE_MAILING_LIST@$DOMAIN_NAME $PRIVATE_MAILING_LIST + schleuder-newlist $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME -realname "$PRIVATE_MAILING_LIST" -adminaddress $MY_EMAIL_ADDRESS -initmember $MY_EMAIL_ADDRESS -initmemberkey $MY_GPG_PUBLIC_KEY -nointeractive + addemailtofolder $MY_USERNAME $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME $PRIVATE_MAILING_LIST echo 'schleuder:' > /etc/exim4/conf.d/router/550_exim4-config_schleuder echo ' debug_print = "R: schleuder for $local_part@$domain"' >> /etc/exim4/conf.d/router/550_exim4-config_schleuder @@ -5677,7 +5681,7 @@ function create_private_mailing_list { useradd -d /var/schleuderlists -s /bin/false schleuder adduser Debian-exim schleuder usermod -a -G mail schleuder - #exim -d -bt $PRIVATE_MAILING_LIST@$DOMAIN_NAME + #exim -d -bt $PRIVATE_MAILING_LIST@$DEFAULT_DOMAIN_NAME echo 'create_private_mailing_list' >> $COMPLETION_FILE } @@ -6093,11 +6097,10 @@ function install_owncloud { fi # if this is exclusively a cloud setup if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then - if [ ! $DOMAIN_NAME ]; then + if [ ! $DEFAULT_DOMAIN_NAME ]; then echo 'No default domain name when installing cloud variant' exit 5380 fi - OWNCLOUD_DOMAIN_NAME=$DOMAIN_NAME fi if [ ! $OWNCLOUD_DOMAIN_NAME ]; then echo 'No Owncloud domain name was specified' @@ -6359,7 +6362,7 @@ function install_xmpp { sed -i "/certificate =/a\ curve = $XMPP_ECC_CURVE;" /etc/prosody/conf.avail/xmpp.cfg.lua fi - sed -i "s/example.com/$DOMAIN_NAME/g" /etc/prosody/conf.avail/xmpp.cfg.lua + sed -i "s/example.com/$DEFAULT_DOMAIN_NAME/g" /etc/prosody/conf.avail/xmpp.cfg.lua sed -i 's/enabled = false -- Remove this line to enable this host//g' /etc/prosody/conf.avail/xmpp.cfg.lua if ! grep -q "modules_enabled" /etc/prosody/conf.avail/xmpp.cfg.lua; then @@ -6405,14 +6408,14 @@ function install_xmpp { sed -i 's/enabled = false -- Remove this line to enable this host//g' /etc/prosody/prosody.cfg.lua sed -i 's|key = "/etc/prosody/certs/example.com.key"|key = "/etc/ssl/private/xmpp.key"|g' /etc/prosody/prosody.cfg.lua sed -i 's|certificate = "/etc/prosody/certs/example.com.crt"|certificate = "/etc/ssl/certs/xmpp.crt"|g' /etc/prosody/prosody.cfg.lua - sed -i "s/example.com/$DOMAIN_NAME/g" /etc/prosody/prosody.cfg.lua + sed -i "s/example.com/$DEFAULT_DOMAIN_NAME/g" /etc/prosody/prosody.cfg.lua service prosody restart touch /home/$MY_USERNAME/README if ! grep -q "Your XMPP password is" /home/$MY_USERNAME/README; then XMPP_PASSWORD=$(openssl rand -base64 8) - prosodyctl register $MY_USERNAME $DOMAIN_NAME $XMPP_PASSWORD + prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME $XMPP_PASSWORD echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README echo 'XMPP' >> /home/$MY_USERNAME/README @@ -6469,8 +6472,8 @@ function install_irc_server { echo '**************************************************' >> /etc/ngircd/motd sed -i 's|MotdFile = /etc/ngircd/ngircd.motd|MotdFile = /etc/ngircd/motd|g' /etc/ngircd/ngircd.conf sed -i "s/irc@irc.example.com/$MY_EMAIL_ADDRESS/g" /etc/ngircd/ngircd.conf - sed -i "s/irc.example.net/$DOMAIN_NAME/g" /etc/ngircd/ngircd.conf - sed -i "s|Yet another IRC Server running on Debian GNU/Linux|IRC Server of $DOMAIN_NAME|g" /etc/ngircd/ngircd.conf + sed -i "s/irc.example.net/$DEFAULT_DOMAIN_NAME/g" /etc/ngircd/ngircd.conf + sed -i "s|Yet another IRC Server running on Debian GNU/Linux|IRC Server of $DEFAULT_DOMAIN_NAME|g" /etc/ngircd/ngircd.conf sed -i 's/;Password = wealllikedebian/Password =/g' /etc/ngircd/ngircd.conf sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf @@ -6508,8 +6511,8 @@ function install_irc_server { echo '==========' >> /home/$MY_USERNAME/README echo 'To connect to your IRC server in irssi:' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README - echo " /server add -auto -ssl $DOMAIN_NAME 6697" >> /home/$MY_USERNAME/README - echo " /connect $DOMAIN_NAME" >> /home/$MY_USERNAME/README + echo " /server add -auto -ssl $DEFAULT_DOMAIN_NAME 6697" >> /home/$MY_USERNAME/README + echo " /connect $DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README echo ' /join #freedombone' >> /home/$MY_USERNAME/README fi @@ -6531,10 +6534,6 @@ function install_wiki { if grep -Fxq "install_wiki" $COMPLETION_FILE; then return fi - # 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 - fi if [ ! $WIKI_DOMAIN_NAME ]; then return fi @@ -7302,10 +7301,6 @@ function install_redmatrix { if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" ]]; then return fi - # if this is exclusively a social setup - if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then - REDMATRIX_DOMAIN_NAME=$DOMAIN_NAME - fi if [ ! $REDMATRIX_DOMAIN_NAME ]; then return fi @@ -7662,10 +7657,6 @@ function install_mediagoblin { if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_TOR_DONGLE" ]]; then return fi - # if this is exclusively a writer setup - if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then - MEDIAGOBLIN_DOMAIN_NAME=$DOMAIN_NAME - fi if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then return fi @@ -7909,7 +7900,7 @@ function intrusion_detection { apt-get -y install tripwire apt-get -y autoremove cd /etc/tripwire - cp site.key $DOMAIN_NAME-site.key + cp site.key $DEFAULT_DOMAIN_NAME-site.key echo '' echo '' echo '*** Installing intrusion detection. Press Enter when asked for the local and site passphrases. ***' @@ -8119,7 +8110,7 @@ function create_git_project { echo '' >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND echo -n 'echo "Your project has been created, ' >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND echo 'use the following command to clone the repository"' >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND - echo -n " git clone ssh://$MY_USERNAME@$DOMAIN_NAME:$SSH_PORT" >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND + echo -n " git clone ssh://$MY_USERNAME@$DEFAULT_DOMAIN_NAME:$SSH_PORT" >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND echo '/home/$USER/projects/$GIT_PROJECT_NAME' >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND echo '' >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND echo 'exit 0' >> /usr/bin/$CREATE_GIT_PROJECT_COMMAND @@ -8380,7 +8371,7 @@ function install_voip { exit 57893 fi - sed -i "s|welcometext=.*|welcometext=\"
Welcome to $DOMAIN_NAME VoIP.
Chat freely!
\"|g" /etc/mumble-server.ini + sed -i "s|welcometext=.*|welcometext=\"
Welcome to $DEFAULT_DOMAIN_NAME VoIP.
Chat freely!
\"|g" /etc/mumble-server.ini if [ $VOIP_SERVER_PASSWORD ]; then sed -i "s|serverpassword=.*|serverpassword=$VOIP_SERVER_PASSWORD|g" /etc/mumble-server.ini diff --git a/src/freedombone-config b/src/freedombone-config index 89ddda50..0336fd50 100755 --- a/src/freedombone-config +++ b/src/freedombone-config @@ -53,7 +53,7 @@ VARIANT_MEDIA="media" VARIANT_TOR_DONGLE="tordongle" MY_USERNAME= -DOMAIN_NAME= +DEFAULT_DOMAIN_NAME= MY_EMAIL_ADDRESS= SYSTEM_TYPE= INSTALLING_ON_BBB= @@ -135,7 +135,7 @@ function save_configuration_file { fi echo "MY_USERNAME=$MY_USERNAME" > $CONFIGURATION_FILE - echo "DOMAIN_NAME=$DOMAIN_NAME" >> $CONFIGURATION_FILE + echo "DEFAULT_DOMAIN_NAME=$DEFAULT_DOMAIN_NAME" >> $CONFIGURATION_FILE echo "SYSTEM_TYPE=$SYSTEM_TYPE" >> $CONFIGURATION_FILE echo "INSTALLING_ON_BBB=$INSTALLING_ON_BBB" >> $CONFIGURATION_FILE echo "DDNS_PROVIDER=$DDNS_PROVIDER" >> $CONFIGURATION_FILE @@ -610,10 +610,6 @@ function interactive_configuration { if [[ $TEST_DOMAIN_NAME != $WIKI_DOMAIN_NAME ]]; then WIKI_DOMAIN_NAME= dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50 - else - if [ ! $DOMAIN_NAME ]; then - DOMAIN_NAME=$WIKI_DOMAIN_NAME - fi fi fi done @@ -647,10 +643,6 @@ function interactive_configuration { if [[ $TEST_DOMAIN_NAME != $FULLBLOG_DOMAIN_NAME ]]; then FULLBLOG_DOMAIN_NAME= dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50 - else - if [ ! $DOMAIN_NAME ]; then - DOMAIN_NAME=$FULLBLOG_DOMAIN_NAME - fi fi fi done @@ -679,10 +671,6 @@ function interactive_configuration { if [[ $TEST_DOMAIN_NAME != $OWNCLOUD_DOMAIN_NAME ]]; then OWNCLOUD_DOMAIN_NAME= dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50 - else - if [ ! $DOMAIN_NAME ]; then - DOMAIN_NAME=$OWNCLOUD_DOMAIN_NAME - fi fi fi done @@ -711,10 +699,6 @@ function interactive_configuration { if [[ $TEST_DOMAIN_NAME != $REDMATRIX_DOMAIN_NAME ]]; then REDMATRIX_DOMAIN_NAME= dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50 - else - if [ ! $DOMAIN_NAME ]; then - DOMAIN_NAME=$REDMATRIX_DOMAIN_NAME - fi fi fi done @@ -746,26 +730,22 @@ function interactive_configuration { if [[ $TEST_DOMAIN_NAME != $MICROBLOG_DOMAIN_NAME ]]; then MICROBLOG_DOMAIN_NAME= dialog --title "Domain name validation" --msgbox "$TEST_DOMAIN_NAME" 15 50 - else - if [ ! $DOMAIN_NAME ]; then - DOMAIN_NAME=$MICROBLOG_DOMAIN_NAME - fi fi fi done save_configuration_file fi - if [ ! $DOMAIN_NAME ]; then - while [ ! $DOMAIN_NAME ] + if [ ! $DEFAULT_DOMAIN_NAME ]; then + while [ ! $DEFAULT_DOMAIN_NAME ] do data=$(tempfile 2>/dev/null) trap "rm -f $data" 0 1 2 5 15 dialog --backtitle "Freedombone Configuration" \ - --inputbox "Domain name" 10 30 "$(grep 'DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data + --inputbox "Domain name" 10 30 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data sel=$? case $sel in - 0) DOMAIN_NAME=$(cat $data);; + 0) DEFAULT_DOMAIN_NAME=$(cat $data);; 1) exit 0;; 255) exit 0;; esac diff --git a/website/EN/installation.html b/website/EN/installation.html index badd2382..04add14e 100644 --- a/website/EN/installation.html +++ b/website/EN/installation.html @@ -4,7 +4,7 @@ - + @@ -359,13 +359,13 @@ nano /home/myusername/freedombone/freedombone.cfg

-Add the following, and set the values as needed. Note that for a full install DOMAIN_NAME should be the same as the wiki domain name. +Add the following, and set the values as needed. DEFAULT_DOMAIN_NAME is where your email/xmpp/irc/voip will be accessed from. It could be the same as one of your other domains, or separate. 

MY_USERNAME=myusername
-DOMAIN_NAME=mywikidomain
+DEFAULT_DOMAIN_NAME=mywikidomain
 SYSTEM_TYPE=full
 INSTALLING_ON_BBB=no
 DDNS_PROVIDER=default@freedns.afraid.org