Change email address

doc/EN/backups.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/code.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/controlpanel.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Control Panel
 #+OPTIONS: ^:nil toc:nil

doc/EN/devguide.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/faq.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Frequently asked questions
 #+OPTIONS: ^:nil toc:nil

doc/EN/homeserver.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/index.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/installation.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/mesh.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/mirrors.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Mirroring git repositories
 #+OPTIONS: ^:nil toc:nil

doc/EN/mobile.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/related.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/support.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil
@@ -26,7 +26,7 @@ This site can also be accessed via a Tor browser at *http://2tp3f6vtvhkqpuc6.oni
 
 *PGP/GPG Fingerprint:* D538 1159 CD7A 2F80 2F06 ABA0 0452 CC7C EA98 2E38
 
-*XMPP:* bob@robotics.uk.to with OTR
+*XMPP:* bob@freedombone.net with OMEMO or OTR
 
 *Tox:* 82DD53788AB400843BC75EA96B62DD6C76D2B13E476B995B13C49920A3C8FD32E5365A82FA83
 

doc/EN/usage.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/usage_email.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

doc/EN/variants.org

@@ -1,6 +1,6 @@
 #+TITLE:
 #+AUTHOR: Bob Mottram
-#+EMAIL: bob@robotics.uk.to
+#+EMAIL: bob@freedombone.net
 #+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
 #+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
 #+OPTIONS: ^:nil toc:nil

src/freedombone

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-addcert

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-addemail

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -52,32 +52,32 @@ do
     key="$1"
 
     case $key in
-	-h|--help)
-	    show_help
-	    ;;
-	-u|--user)
-	    shift
-	    MYUSERNAME="$1"
-	    ;;
-	-e|--email)
-	    shift
-	    EMAILADDRESS="$1"
-	    ;;
-	-s|--subject)
-	    shift
-	    SUBJECT_TEXT="$1"
-	    ;;
-	-g|--group)
-	    shift
-	    GROUP_NAME="$1"
-	    ;;
-	-p|--public)
-	    shift
-	    PUBLIC="$1"
-	    ;;
-	*)
-	    # unknown option
-	    ;;
+    -h|--help)
+        show_help
+        ;;
+    -u|--user)
+        shift
+        MYUSERNAME="$1"
+        ;;
+    -e|--email)
+        shift
+        EMAILADDRESS="$1"
+        ;;
+    -s|--subject)
+        shift
+        SUBJECT_TEXT="$1"
+        ;;
+    -g|--group)
+        shift
+        GROUP_NAME="$1"
+        ;;
+    -p|--public)
+        shift
+        PUBLIC="$1"
+        ;;
+    *)
+        # unknown option
+        ;;
     esac
     shift
 done
@@ -88,7 +88,7 @@ fi
 
 if [ ${#EMAILADDRESS} -lt 2 ]; then
     if [ ${#SUBJECT_TEXT} -lt 2 ]; then
-	show_help
+    show_help
     fi
 fi
 
@@ -112,26 +112,26 @@ fi
 chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
 if ! grep -q "$proc_comment" $PM; then
     if [[ $PUBLIC != "yes" ]]; then
-	# private emails go after the encryption stage
-	echo '' >> $PM
-	echo "$proc_comment" >> $PM
-	echo ":0" >> $PM
-	echo "$proc_rule" >> $PM
-	echo "$LISTDIR/new" >> $PM
-	echo "# End of rule" >> $PM
+    # private emails go after the encryption stage
+    echo '' >> $PM
+    echo "$proc_comment" >> $PM
+    echo ":0" >> $PM
+    echo "$proc_rule" >> $PM
+    echo "$LISTDIR/new" >> $PM
+    echo "# End of rule" >> $PM
+    else
+    # public emails are copied before the encryption stage
+    if ! grep -q '# encrypt' $PM; then
+        echo '' >> $PM
+        echo "$proc_comment" >> $PM
+        echo ":0" >> $PM
+        echo "$proc_rule" >> $PM
+        echo "$LISTDIR/new" >> $PM
+        echo "# End of rule" >> $PM
     else
-	# public emails are copied before the encryption stage
-	if ! grep -q '# encrypt' $PM; then
-	    echo '' >> $PM
-	    echo "$proc_comment" >> $PM
-	    echo ":0" >> $PM
-	    echo "$proc_rule" >> $PM
-	    echo "$LISTDIR/new" >> $PM
-	    echo "# End of rule" >> $PM
-	else
-	    filter=$(echo "$proc_comment\n:0\n${proc_rule}\n$LISTDIR/new\n# End of rule\n")
-	    sed -i "/# encrypt/i ${filter}" $PM
-	fi
+        filter=$(echo "$proc_comment\n:0\n${proc_rule}\n$LISTDIR/new\n# End of rule\n")
+        sed -i "/# encrypt/i ${filter}" $PM
+    fi
     fi
     chown $MYUSERNAME:$MYUSERNAME $PM
 fi
@@ -150,8 +150,8 @@ fi
 MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)
 if [[ $MUTT_MAILBOXES != *$GROUP_NAME* ]]; then
     if ! grep -q "=$GROUP_NAME" $MUTTRC; then
-	sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$GROUP_NAME|g" $MUTTRC
-	chown $MYUSERNAME:$MYUSERNAME $MUTTRC
+    sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$GROUP_NAME|g" $MUTTRC
+    chown $MYUSERNAME:$MYUSERNAME $MUTTRC
     fi
 fi
 

src/freedombone-addlist

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -52,32 +52,32 @@ do
     key="$1"
 
     case $key in
-	-h|--help)
-	    show_help
-	    ;;
-	-u|--user)
-	    shift
-	    MYUSERNAME="$1"
-	    ;;
-	-l|--list)
-	    shift
-	    MAILINGLIST="$1"
-	    ;;
-	-s|--subject)
-	    shift
-	    SUBJECTTAG="$1"
-	    ;;
-	-e|--email)
-	    shift
-	    LIST_ADDRESS="$1"
-	    ;;
-	-p|--public)
-	    shift
-	    PUBLIC="$1"
-	    ;;
-	*)
-	    # unknown option
-	    ;;
+    -h|--help)
+        show_help
+        ;;
+    -u|--user)
+        shift
+        MYUSERNAME="$1"
+        ;;
+    -l|--list)
+        shift
+        MAILINGLIST="$1"
+        ;;
+    -s|--subject)
+        shift
+        SUBJECTTAG="$1"
+        ;;
+    -e|--email)
+        shift
+        LIST_ADDRESS="$1"
+        ;;
+    -p|--public)
+        shift
+        PUBLIC="$1"
+        ;;
+    *)
+        # unknown option
+        ;;
     esac
     shift
 done
@@ -110,33 +110,33 @@ chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
 if [ ${#SUBJECTTAG} -gt 0 ]; then
     # use the subject tag
     if ! grep -q "Subject:.*()\[$SUBJECTTAG\]" $PM; then
-	if [[ $PUBLIC != "yes" ]]; then
-	    # private emails go after the encryption stage
-	    filter="
+    if [[ $PUBLIC != "yes" ]]; then
+        # private emails go after the encryption stage
+        filter="
 # Email rule for $MAILINGLIST subject [$SUBJECTTAG]
 :0
   * ^Subject:.*()\[$SUBJECTTAG\]
 $LISTDIR/new
 # End of rule
 "
-	    echo "$filter" >> $PM
-	else
-	    # public emails are copied before hte encryption stage
-	    if ! grep -q '# encrypt' $PM; then
-		filter="
+        echo "$filter" >> $PM
+    else
+        # public emails are copied before hte encryption stage
+        if ! grep -q '# encrypt' $PM; then
+        filter="
 # Email rule for $MAILINGLIST subject [$SUBJECTTAG]
 :0
   * ^Subject:.*()\[$SUBJECTTAG\]
 $LISTDIR/new
 # End of rule
 "
-		echo "$filter" >> $PM
-	    else
-		filter=$(echo "# Email rule for $MAILINGLIST subject [$SUBJECTTAG]\n:0\n  * ^Subject:.*()\\\[$SUBJECTTAG\\\]\n$LISTDIR/new\n# End of rule\n")
-		sed -i "/# encrypt/i ${filter}" $PM
-	    fi
-	fi
-	chown $MYUSERNAME:$MYUSERNAME $PM
+        echo "$filter" >> $PM
+        else
+        filter=$(echo "# Email rule for $MAILINGLIST subject [$SUBJECTTAG]\n:0\n  * ^Subject:.*()\\\[$SUBJECTTAG\\\]\n$LISTDIR/new\n# End of rule\n")
+        sed -i "/# encrypt/i ${filter}" $PM
+        fi
+    fi
+    chown $MYUSERNAME:$MYUSERNAME $PM
     fi
 else
     exit $(${PROJECT_NAME}-addemail -u $MYUSERNAME -e $LIST_ADDRESS -g $MAILINGLIST --public $PUBLIC)
@@ -156,15 +156,15 @@ fi
 MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)
 if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then
     if ! grep -q "=$MAILINGLIST" $MUTTRC; then
-	sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC
-	chown $MYUSERNAME:$MYUSERNAME $MUTTRC
+    sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC
+    chown $MYUSERNAME:$MYUSERNAME $MUTTRC
     fi
 fi
 
 if [ $LIST_ADDRESS ]; then
     sed -i "s|unsubscribe $LIST_ADDRESS|subscribe $LIST_ADDRESS|g" $MUTTRC
     if ! grep -q "subscribe $LIST_ADDRESS" $MUTTRC; then
-	echo "subscribe $LIST_ADDRESS" >> $MUTTRC
+    echo "subscribe $LIST_ADDRESS" >> $MUTTRC
     fi
 fi
 

src/freedombone-addremove

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-addsipuser

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -50,10 +50,10 @@ function show_help {
 function sip_user_exists {
     IFS=''
     while read line; do
-	if [[ "$line" == *"<user id=\"$MY_USERNAME\">" ]]; then
-	    USER_EXISTS="yes"
-	    return
-	fi
+    if [[ "$line" == *"<user id=\"$MY_USERNAME\">" ]]; then
+        USER_EXISTS="yes"
+        return
+    fi
     done < $CONFIG_FILE
 }
 
@@ -61,28 +61,28 @@ function update_sip_user {
     USER_FOUND=
     NEW_CONFIG_FILE="${CONFIG_FILE}.new"
     if [ -f $NEW_CONFIG_FILE ]; then
-	rm -f $NEW_CONFIG_FILE
+    rm -f $NEW_CONFIG_FILE
     fi
     touch $NEW_CONFIG_FILE
     IFS=''
     while read line; do
-	if [ ! $USER_FOUND ]; then
-	    if [[ "$line" == *"<user id=\"$MY_USERNAME\">" ]]; then
-		USER_FOUND="yes"
-	    fi
-	else
-	    if [[ "$line" == *"<extension>"* ]]; then
-		line="      <extension>$EXTENSION</extension>"
-	    fi
-	    if [[ "$line" == *"<secret>"* ]]; then
-		line="      <secret>$PASSWORD</secret>"
-	    fi
-	    if [[ "$line" == *"<display>"* ]]; then
-		line="      <display>$MY_USERNAME $EXTENSION</display>"
-		USER_FOUND=
-	    fi
-	fi
-	echo $line >> $NEW_CONFIG_FILE
+    if [ ! $USER_FOUND ]; then
+        if [[ "$line" == *"<user id=\"$MY_USERNAME\">" ]]; then
+        USER_FOUND="yes"
+        fi
+    else
+        if [[ "$line" == *"<extension>"* ]]; then
+        line="      <extension>$EXTENSION</extension>"
+        fi
+        if [[ "$line" == *"<secret>"* ]]; then
+        line="      <secret>$PASSWORD</secret>"
+        fi
+        if [[ "$line" == *"<display>"* ]]; then
+        line="      <display>$MY_USERNAME $EXTENSION</display>"
+        USER_FOUND=
+        fi
+    fi
+    echo $line >> $NEW_CONFIG_FILE
     done < $CONFIG_FILE
     mv $NEW_CONFIG_FILE $CONFIG_FILE
 }
@@ -90,19 +90,19 @@ function update_sip_user {
 function add_sip_user {
     NEW_CONFIG_FILE="${CONFIG_FILE}.new"
     if [ -f $NEW_CONFIG_FILE ]; then
-	rm -f $NEW_CONFIG_FILE
+    rm -f $NEW_CONFIG_FILE
     fi
     touch $NEW_CONFIG_FILE
     IFS=''
     while read line; do
-	if [[ "$line" == *'</provision>' ]]; then
-	    echo "    <user id=\"$MY_USERNAME\">" >> $NEW_CONFIG_FILE
-	    echo "      <extension>$EXTENSION</extension>" >> $NEW_CONFIG_FILE
-	    echo "      <secret>$PASSWORD</secret>" >> $NEW_CONFIG_FILE
-	    echo "      <display>$MY_USERNAME $EXTENSION</display>" >> $NEW_CONFIG_FILE
-	    echo '    </user>' >> $NEW_CONFIG_FILE
-	fi
-	echo $line >> $NEW_CONFIG_FILE
+    if [[ "$line" == *'</provision>' ]]; then
+        echo "    <user id=\"$MY_USERNAME\">" >> $NEW_CONFIG_FILE
+        echo "      <extension>$EXTENSION</extension>" >> $NEW_CONFIG_FILE
+        echo "      <secret>$PASSWORD</secret>" >> $NEW_CONFIG_FILE
+        echo "      <display>$MY_USERNAME $EXTENSION</display>" >> $NEW_CONFIG_FILE
+        echo '    </user>' >> $NEW_CONFIG_FILE
+    fi
+    echo $line >> $NEW_CONFIG_FILE
     done < $CONFIG_FILE
     mv $NEW_CONFIG_FILE $CONFIG_FILE
     usermod -aG sipwitch $MY_USERNAME
@@ -113,24 +113,24 @@ do
     key="$1"
 
     case $key in
-	-h|--help)
-	    show_help
-	    ;;
-	-u|--user)
-	    shift
-	    MY_USERNAME="$1"
-	    ;;
-	-e|--extension)
-	    shift
-	    EXTENSION="$1"
-	    ;;
-	-p|--password)
-	    shift
-	    PASSWORD="$1"
-	    ;;
-	*)
-	    # unknown option
-	    ;;
+    -h|--help)
+        show_help
+        ;;
+    -u|--user)
+        shift
+        MY_USERNAME="$1"
+        ;;
+    -e|--extension)
+        shift
+        EXTENSION="$1"
+        ;;
+    -p|--password)
+        shift
+        PASSWORD="$1"
+        ;;
+    *)
+        # unknown option
+        ;;
     esac
     shift
 done

src/freedombone-adduser

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-addxmpp

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-batman

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-dlna

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-dokuwiki

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-emacs

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-gnusocial

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-gogs

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-htmly

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-hubzilla

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-ipfs

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-irc

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-librevault

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-mediagoblin

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-mumble

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-pelican

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-pihole

@@ -16,7 +16,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-rss

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-searx

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-sip

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-syncthing

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-tahoelafs

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-tox

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-vim

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-vpn

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-webmail

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-xmpp

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-app-zeronet

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-archive-mail

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-backup-local

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-backup-remote

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-base-email

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-base-tripwire

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-client

@@ -11,7 +11,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-clientcert

@@ -17,7 +17,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-config

@@ -14,7 +14,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-controlpanel

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-controlpanel-user

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-dhparam

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -131,104 +131,104 @@ aDWQRvTrh5+SQAlDi0gcbNeImgAu1e44K8kZDab8Am5HlVjkR1Z36aqeMFDidlaU
 '
 
 function show_help {
-	echo ''
-	echo $"${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]"
-	echo ''
-	exit 0
+    echo ''
+    echo $"${PROJECT_NAME}-dhparam -h [hostname] -l [length in bits] --recalc [yes|no] --fast [yes|no]"
+    echo ''
+    exit 0
 }
 
 function calc_dh {
-	if [[ $FAST == 'yes' ]]; then
-		DHGROUP=$(( ( RANDOM % 4 )  + 14 ))
-		if [[ ${DHGROUP} == 14 ]]; then
-			echo "$BETTERCRYPTO_GROUP14" > ${1}
-		else
-			if [[ ${DHGROUP} == 15 ]]; then
-				echo "$BETTERCRYPTO_GROUP15" > ${1}
-			else
-				if [[ ${DHGROUP} == 16 ]]; then
-					echo "$BETTERCRYPTO_GROUP16" > ${1}
-				else
-					if [[ ${DHGROUP} == 17 ]]; then
-						echo "$BETTERCRYPTO_GROUP17" > ${1}
-					else
-						echo "$BETTERCRYPTO_GROUP18" > ${1}
-					fi
-				fi
-			fi
-		fi
-	else
-		openssl dhparam -check -text $KEYLENGTH -out ${1}
-		if [ ! "$?" = "0" ]; then
-			exit 3674
-		fi
-	fi
-	chmod 640 ${1}
+    if [[ $FAST == 'yes' ]]; then
+        DHGROUP=$(( ( RANDOM % 4 )  + 14 ))
+        if [[ ${DHGROUP} == 14 ]]; then
+            echo "$BETTERCRYPTO_GROUP14" > ${1}
+        else
+            if [[ ${DHGROUP} == 15 ]]; then
+                echo "$BETTERCRYPTO_GROUP15" > ${1}
+            else
+                if [[ ${DHGROUP} == 16 ]]; then
+                    echo "$BETTERCRYPTO_GROUP16" > ${1}
+                else
+                    if [[ ${DHGROUP} == 17 ]]; then
+                        echo "$BETTERCRYPTO_GROUP17" > ${1}
+                    else
+                        echo "$BETTERCRYPTO_GROUP18" > ${1}
+                    fi
+                fi
+            fi
+        fi
+    else
+        openssl dhparam -check -text $KEYLENGTH -out ${1}
+        if [ ! "$?" = "0" ]; then
+            exit 3674
+        fi
+    fi
+    chmod 640 ${1}
 }
 
 function regenerate_dh_keys {
-	for file in /etc/ssl/mycerts/*
-	do
-		if [[ -f $file ]]; then
-			filename=/etc/ssl/certs/$(echo $file | awk -F '/etc/ssl/mycerts/' '{print $2}' | awk -F '.crt' '{print $1}').dhparam
-			if [ -f $filename ]; then
-				calc_dh $filename
-				echo $"Recalculated DH params for $filename"
-			fi
-		fi
-	done
+    for file in /etc/ssl/mycerts/*
+    do
+        if [[ -f $file ]]; then
+            filename=/etc/ssl/certs/$(echo $file | awk -F '/etc/ssl/mycerts/' '{print $2}' | awk -F '.crt' '{print $1}').dhparam
+            if [ -f $filename ]; then
+                calc_dh $filename
+                echo $"Recalculated DH params for $filename"
+            fi
+        fi
+    done
 }
 
 while [[ $# > 1 ]]
 do
-	key="$1"
-
-	case $key in
-		--help)
-			show_help
-			;;
-		-h|--hostname)
-			shift
-			HOSTNAME="$1"
-			;;
-		-l|--dhkey)
-			shift
-			KEYLENGTH=${1}
-			;;
-		--recalc)
-			shift
-			RECALCULATE=${1}
-			;;
-		--fast)
-			shift
-			if [[ ${1} == $"yes" || ${1} == $"y" ]]; then
-				FAST='yes'
-			fi
-			;;
-		*)
-			# unknown option
-			;;
-	esac
-	shift
+    key="$1"
+
+    case $key in
+        --help)
+            show_help
+            ;;
+        -h|--hostname)
+            shift
+            HOSTNAME="$1"
+            ;;
+        -l|--dhkey)
+            shift
+            KEYLENGTH=${1}
+            ;;
+        --recalc)
+            shift
+            RECALCULATE=${1}
+            ;;
+        --fast)
+            shift
+            if [[ ${1} == $"yes" || ${1} == $"y" ]]; then
+                FAST='yes'
+            fi
+            ;;
+        *)
+            # unknown option
+            ;;
+    esac
+    shift
 done
 
 if [[ $RECALCULATE == "yes" || $RECALCULATE == "y" ]]; then
-	regenerate_dh_keys
-	exit 0
+    regenerate_dh_keys
+    exit 0
 fi
 
 if [ ! $HOSTNAME ]; then
-	echo $'No hostname specified'
-	exit 5728
+    echo $'No hostname specified'
+    exit 5728
 fi
 
 if ! which openssl > /dev/null ;then
-	echo $"$0: openssl is not installed, exiting" 1>&2
-	exit 5689
+    echo $"$0: openssl is not installed, exiting" 1>&2
+    exit 5689
 fi
 
 if [ ! -d /etc/ssl/mycerts ]; then
-	mkdir -p /etc/ssl/mycerts
+    mkdir -p /etc/ssl/mycerts
 fi
 
 calc_dh /etc/ssl/certs/$HOSTNAME.dhparam

src/freedombone-encrypt-mail

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2014-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2014-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-format

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-freedns

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-ignore

@@ -15,7 +15,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-image

@@ -15,7 +15,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-keydrive

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-logging

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-mesh

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-mesh-batman

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-mirrors

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-pin-cert

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-recoverkey

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by

src/freedombone-remote

@@ -13,7 +13,7 @@
 # License
 # =======
 #
-# Copyright (C) 2015-2016 Bob Mottram <bob@robotics.uk.to>
+# Copyright (C) 2015-2016 Bob Mottram <bob@freedombone.net>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -58,205 +58,205 @@ TITLE='Remote Backup'
 RECIPROCAL="no"
 
 function show_help {
-	echo ''
-	echo $"${PROJECT_NAME}-remote -u [username] -l [backup list filename] -m [min password length]"
-	echo ''
-	echo $'Creates an inventory of remote backup locations'
-	echo ''
-	echo ''
-	echo $'  -h --help             Show help'
-	echo $'  -u --username         User to create the backups.list file for'
-	echo $'  -l --list             Remote backup list (usually /home/$USER/backup.list)'
-	echo $'  -m --min              Minimum password length (characters)'
-	echo $'  -r --reciprocal       Whether to add reciprocal user accounts'
-	echo $'  -t --title            Title shown'
-	echo ''
-	exit 0
+    echo ''
+    echo $"${PROJECT_NAME}-remote -u [username] -l [backup list filename] -m [min password length]"
+    echo ''
+    echo $'Creates an inventory of remote backup locations'
+    echo ''
+    echo ''
+    echo $'  -h --help             Show help'
+    echo $'  -u --username         User to create the backups.list file for'
+    echo $'  -l --list             Remote backup list (usually /home/$USER/backup.list)'
+    echo $'  -m --min              Minimum password length (characters)'
+    echo $'  -r --reciprocal       Whether to add reciprocal user accounts'
+    echo $'  -t --title            Title shown'
+    echo ''
+    exit 0
 }
 
 # Get the commandline options
 while [[ $# > 1 ]]
 do
-	key="$1"
+    key="$1"
 
-	case $key in
-		-h|--help)
-			show_help
-			;;
-		# backup list filename
-		# typically /home/$USER/backup.list
-		-l|--list)
-			shift
-			FRIENDS_SERVERS_LIST="$1"
-			;;
-		# username within /home
-		-u|--user)
-			shift
-			MY_USERNAME="$1"
-			;;
-		# Minimum password length
-		-m|--min)
-			shift
-			MINIMUM_PASSWORD_LENGTH="$1"
-			;;
-		# Title shown
-		-t|--title)
-			shift
-			TITLE="$1"
-			;;
-		# reciprocal user accounts
-		-r|--reciprocal)
-			shift
-			RECIPROCAL="yes"
-			;;
-		*)
-			# unknown option
-			;;
-	esac
-	shift
+    case $key in
+        -h|--help)
+            show_help
+            ;;
+        # backup list filename
+        # typically /home/$USER/backup.list
+        -l|--list)
+            shift
+            FRIENDS_SERVERS_LIST="$1"
+            ;;
+        # username within /home
+        -u|--user)
+            shift
+            MY_USERNAME="$1"
+            ;;
+        # Minimum password length
+        -m|--min)
+            shift
+            MINIMUM_PASSWORD_LENGTH="$1"
+            ;;
+        # Title shown
+        -t|--title)
+            shift
+            TITLE="$1"
+            ;;
+        # reciprocal user accounts
+        -r|--reciprocal)
+            shift
+            RECIPROCAL="yes"
+            ;;
+        *)