|  | @@ -210,7 +210,7 @@ OWNCLOUD_MUSIC_APP_COMMIT='7f79afb4ae9a6ecd8f530d87106f960306c0a15a'
 | 
	
		
			
			| 210 | 210 |  # Domain name for your wiki
 | 
	
		
			
			| 211 | 211 |  WIKI_DOMAIN_NAME=
 | 
	
		
			
			| 212 | 212 |  WIKI_ADMIN_PASSWORD=
 | 
	
		
			
			| 213 |  | -WIKI_TITLE="Freedombone Wiki"
 | 
	
		
			
			|  | 213 | +WIKI_TITLE="${PROJECT_NAME} Wiki"
 | 
	
		
			
			| 214 | 214 |  WIKI_CODE=
 | 
	
		
			
			| 215 | 215 |  
 | 
	
		
			
			| 216 | 216 |  # Domain name for your blog
 | 
	
	
		
			
			|  | @@ -220,7 +220,7 @@ FULLBLOG_ONION_PORT=8086
 | 
	
		
			
			| 220 | 220 |  FULLBLOG_REPO="https://github.com/danpros/htmly"
 | 
	
		
			
			| 221 | 221 |  FULLBLOG_COMMIT='5f271a2370cc1bfde15f2a0d5ed6928cc74b0efa'
 | 
	
		
			
			| 222 | 222 |  MY_BLOG_TITLE="My Blog"
 | 
	
		
			
			| 223 |  | -MY_BLOG_SUBTITLE="Another Freedombone Blog"
 | 
	
		
			
			|  | 223 | +MY_BLOG_SUBTITLE="Another ${PROJECT_NAME} Blog"
 | 
	
		
			
			| 224 | 224 |  
 | 
	
		
			
			| 225 | 225 |  GPG_KEYSERVER="hkp://keys.gnupg.net"
 | 
	
		
			
			| 226 | 226 |  
 | 
	
	
		
			
			|  | @@ -468,7 +468,7 @@ LETSENCRYPT_SERVER='https://acme-v01.api.letsencrypt.org/directory'
 | 
	
		
			
			| 468 | 468 |  
 | 
	
		
			
			| 469 | 469 |  function show_help {
 | 
	
		
			
			| 470 | 470 |    echo ''
 | 
	
		
			
			| 471 |  | -  echo $'freedombone -c [configuration file]'
 | 
	
		
			
			|  | 471 | +  echo $"${PROJECT_NAME} -c [configuration file]"
 | 
	
		
			
			| 472 | 472 |    echo ''
 | 
	
		
			
			| 473 | 473 |    echo $'  -h --help             Show help'
 | 
	
		
			
			| 474 | 474 |    echo $'     menuconfig         Easy interactive installation'
 | 
	
	
		
			
			|  | @@ -614,7 +614,7 @@ function interactive_configuration {
 | 
	
		
			
			| 614 | 614 |        FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list
 | 
	
		
			
			| 615 | 615 |  
 | 
	
		
			
			| 616 | 616 |        dialog --title $"Encrypted backup to other servers" \
 | 
	
		
			
			| 617 |  | -             --backtitle $"Freedombone Configuration" \
 | 
	
		
			
			|  | 617 | +             --backtitle $"${PROJECT_NAME} Configuration" \
 | 
	
		
			
			| 618 | 618 |               --defaultno \
 | 
	
		
			
			| 619 | 619 |               --yesno $"\nDo you wish to configure some remote backup locations?" 7 60
 | 
	
		
			
			| 620 | 620 |        sel=$?
 | 
	
	
		
			
			|  | @@ -848,7 +848,7 @@ function parse_args {
 | 
	
		
			
			| 848 | 848 |        SYSTEM_TYPE=$VARIANT_FULL
 | 
	
		
			
			| 849 | 849 |    fi
 | 
	
		
			
			| 850 | 850 |    if [[ $SYSTEM_TYPE != $VARIANT_WRITER && $SYSTEM_TYPE != $VARIANT_CLOUD && $SYSTEM_TYPE != $VARIANT_CHAT && $SYSTEM_TYPE != $VARIANT_MAILBOX && $SYSTEM_TYPE != $VARIANT_NONMAILBOX && $SYSTEM_TYPE != $VARIANT_SOCIAL && $SYSTEM_TYPE != $VARIANT_MEDIA && $SYSTEM_TYPE != $VARIANT_DEVELOPER && $SYSTEM_TYPE != $VARIANT_MESH && $SYSTEM_TYPE != $VARIANT_FULL ]]; then
 | 
	
		
			
			| 851 |  | -      echo $"'$SYSTEM_TYPE' is an unrecognised Freedombone variant."
 | 
	
		
			
			|  | 851 | +      echo $"'$SYSTEM_TYPE' is an unrecognised ${PROJECT_NAME} variant."
 | 
	
		
			
			| 852 | 852 |        exit 30
 | 
	
		
			
			| 853 | 853 |    fi
 | 
	
		
			
			| 854 | 854 |  }
 | 
	
	
		
			
			|  | @@ -870,8 +870,8 @@ function read_configuration {
 | 
	
		
			
			| 870 | 870 |  
 | 
	
		
			
			| 871 | 871 |    if [ -f $CONFIGURATION_FILE ]; then
 | 
	
		
			
			| 872 | 872 |        # Ensure that a copy of the config exists for upgrade purposes
 | 
	
		
			
			| 873 |  | -      if [[ $CONFIGURATION_FILE != '/root/freedombone.cfg' ]]; then
 | 
	
		
			
			| 874 |  | -          cp $CONFIGURATION_FILE /root/freedombone.cfg
 | 
	
		
			
			|  | 873 | +      if [[ $CONFIGURATION_FILE != "/root/${PROJECT_NAME}.cfg" ]]; then
 | 
	
		
			
			|  | 874 | +          cp $CONFIGURATION_FILE /root/${PROJECT_NAME}.cfg
 | 
	
		
			
			| 875 | 875 |        fi
 | 
	
		
			
			| 876 | 876 |        if grep -q "IRC_PASSWORD" $CONFIGURATION_FILE; then
 | 
	
		
			
			| 877 | 877 |            IRC_PASSWORD=$(grep "IRC_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
 | 
	
	
		
			
			|  | @@ -1821,7 +1821,7 @@ function mesh_cjdns {
 | 
	
		
			
			| 1821 | 1821 |        echo $"cjdns password: $CJDNS_PASSWORD" >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 1822 | 1822 |        echo $"cjdns port: $CJDNS_PORT" >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 1823 | 1823 |        echo '' >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 1824 |  | -      echo $"Forward port $CJDNS_PORT from your internet router to the Freedombone" >> /home/$MY_USERNAME/README
 | 
	
		
			
			|  | 1824 | +      echo $"Forward port $CJDNS_PORT from your internet router to the ${PROJECT_NAME}" >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 1825 | 1825 |        echo '' >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 1826 | 1826 |        echo $'Below is an example of your connection credentials' >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 1827 | 1827 |        echo $'that you can give to other people so they can connect' >> /home/$MY_USERNAME/README
 | 
	
	
		
			
			|  | @@ -5188,12 +5188,12 @@ function import_email {
 | 
	
		
			
			| 5188 | 5188 |    if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
 | 
	
		
			
			| 5189 | 5189 |        return
 | 
	
		
			
			| 5190 | 5190 |    fi
 | 
	
		
			
			| 5191 |  | -  EMAIL_COMPLETE_MSG=$'
 | 
	
		
			
			| 5192 |  | -  *** Freedombone mailbox installation is complete ***
 | 
	
		
			
			|  | 5191 | +  EMAIL_COMPLETE_MSG=$"
 | 
	
		
			
			|  | 5192 | +  *** ${PROJECT_NAME} mailbox installation is complete ***
 | 
	
		
			
			| 5193 | 5193 |  
 | 
	
		
			
			| 5194 | 5194 |        Now on your internet router forward ports
 | 
	
		
			
			| 5195 |  | -     25, 587, 465, 993 and 2222 to the freedombone
 | 
	
		
			
			| 5196 |  | -'
 | 
	
		
			
			|  | 5195 | +     25, 587, 465, 993 and 2222 to the ${PROJECT_NAME}
 | 
	
		
			
			|  | 5196 | +"
 | 
	
		
			
			| 5197 | 5197 |    if grep -Fxq "import_email" $COMPLETION_FILE; then
 | 
	
		
			
			| 5198 | 5198 |        if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then
 | 
	
		
			
			| 5199 | 5199 |            backup_to_friends_servers
 | 
	
	
		
			
			|  | @@ -5599,7 +5599,7 @@ function install_owncloud {
 | 
	
		
			
			| 5599 | 5599 |    if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
 | 
	
		
			
			| 5600 | 5600 |        return
 | 
	
		
			
			| 5601 | 5601 |    fi
 | 
	
		
			
			| 5602 |  | -  OWNCLOUD_COMPLETION_MSG1=$" *** Freedombone $SYSTEM_TYPE is now installed ***"
 | 
	
		
			
			|  | 5602 | +  OWNCLOUD_COMPLETION_MSG1=$" *** ${PROJECT_NAME} $SYSTEM_TYPE is now installed ***"
 | 
	
		
			
			| 5603 | 5603 |    OWNCLOUD_COMPLETION_MSG2=$"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup"
 | 
	
		
			
			| 5604 | 5604 |    if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
 | 
	
		
			
			| 5605 | 5605 |        if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
 | 
	
	
		
			
			|  | @@ -6624,11 +6624,11 @@ function install_irc_server {
 | 
	
		
			
			| 6624 | 6624 |    sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
 | 
	
		
			
			| 6625 | 6625 |    sed -i 's|;KeyFile = /etc/ssl/private/server.key|KeyFile = /etc/ssl/private/ngircd.key|g' /etc/ngircd/ngircd.conf
 | 
	
		
			
			| 6626 | 6626 |    sed -i "s/;Ports =.*/Ports = $IRC_PORT, 9999/g" /etc/ngircd/ngircd.conf
 | 
	
		
			
			| 6627 |  | -  sed -i 's/;Name = #ngircd/Name = #freedombone/g' /etc/ngircd/ngircd.conf
 | 
	
		
			
			| 6628 |  | -  sed -i 's/;Topic = Our ngircd testing channel/Topic = Freedombone chat channel/g' /etc/ngircd/ngircd.conf
 | 
	
		
			
			|  | 6627 | +  sed -i "s/;Name = #ngircd/Name = #${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
 | 
	
		
			
			|  | 6628 | +  sed -i "s/;Topic = Our ngircd testing channel/Topic = ${PROJECT_NAME} chat channel/g" /etc/ngircd/ngircd.conf
 | 
	
		
			
			| 6629 | 6629 |    sed -i 's/;MaxUsers = 23/MaxUsers = 23/g' /etc/ngircd/ngircd.conf
 | 
	
		
			
			| 6630 |  | -  sed -i 's|;KeyFile = /etc/ngircd/#chan.key|KeyFile = /etc/ngircd/#freedombone.key|g' /etc/ngircd/ngircd.conf
 | 
	
		
			
			| 6631 |  | -  sed -i 's/;CloakHost = cloaked.host/CloakHost = freedombone/g' /etc/ngircd/ngircd.conf
 | 
	
		
			
			|  | 6630 | +  sed -i "s|;KeyFile = /etc/ngircd/#chan.key|KeyFile = /etc/ngircd/#${PROJECT_NAME}.key|g" /etc/ngircd/ngircd.conf
 | 
	
		
			
			|  | 6631 | +  sed -i "s/;CloakHost = cloaked.host/CloakHost = ${PROJECT_NAME}/g" /etc/ngircd/ngircd.conf
 | 
	
		
			
			| 6632 | 6632 |    IRC_SALT="$(openssl rand -base64 32)"
 | 
	
		
			
			| 6633 | 6633 |    if [ -f $IMAGE_PASSWORD_FILE ]; then
 | 
	
		
			
			| 6634 | 6634 |        IRC_OPERATOR_PASSWORD="$(printf `cat $IMAGE_PASSWORD_FILE`)"
 | 
	
	
		
			
			|  | @@ -6674,7 +6674,7 @@ function install_irc_server {
 | 
	
		
			
			| 6674 | 6674 |        echo '' >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 6675 | 6675 |        echo "  /server add -auto -ssl $DEFAULTDOMAIN $IRC_PORT" >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 6676 | 6676 |        echo "  /connect $DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 6677 |  | -      echo '  /join #freedombone' >> /home/$MY_USERNAME/README
 | 
	
		
			
			|  | 6677 | +      echo "  /join #${PROJECT_NAME}" >> /home/$MY_USERNAME/README
 | 
	
		
			
			| 6678 | 6678 |        chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
 | 
	
		
			
			| 6679 | 6679 |        chmod 600 /home/$MY_USERNAME/README
 | 
	
		
			
			| 6680 | 6680 |    fi
 | 
	
	
		
			
			|  | @@ -8181,7 +8181,7 @@ function install_dlna_server {
 | 
	
		
			
			| 8181 | 8181 |    else
 | 
	
		
			
			| 8182 | 8182 |        sed -i 's/#network_interface=/network_interface=$WIFI_INTERFACE/g' /etc/minidlna.conf
 | 
	
		
			
			| 8183 | 8183 |    fi
 | 
	
		
			
			| 8184 |  | -  sed -i 's/#friendly_name=/friendly_name="Freedombone Media"/g' /etc/minidlna.conf
 | 
	
		
			
			|  | 8184 | +  sed -i "s/#friendly_name=/friendly_name=\"${PROJECT_NAME} Media\"/g" /etc/minidlna.conf
 | 
	
		
			
			| 8185 | 8185 |    sed -i 's|#db_dir=/var/cache/minidlna|db_dir=/var/cache/minidlna|g' /etc/minidlna.conf
 | 
	
		
			
			| 8186 | 8186 |    sed -i 's/#inotify=yes/inotify=yes/g' /etc/minidlna.conf
 | 
	
		
			
			| 8187 | 8187 |    sed -i 's/#notify_interval=895/notify_interval=300/g' /etc/minidlna.conf
 | 
	
	
		
			
			|  | @@ -9018,8 +9018,8 @@ function install_final {
 | 
	
		
			
			| 9018 | 9018 |    echo 'install_final' >> $COMPLETION_FILE
 | 
	
		
			
			| 9019 | 9019 |    clear
 | 
	
		
			
			| 9020 | 9020 |    echo ''
 | 
	
		
			
			| 9021 |  | -  echo $'
 | 
	
		
			
			| 9022 |  | -  *** Freedombone installation is complete. Rebooting... ***
 | 
	
		
			
			|  | 9021 | +  echo $"
 | 
	
		
			
			|  | 9022 | +  *** ${PROJECT_NAME} installation is complete. Rebooting... ***
 | 
	
		
			
			| 9023 | 9023 |  
 | 
	
		
			
			| 9024 | 9024 |      Now forward these ports from your internet router
 | 
	
		
			
			| 9025 | 9025 |  
 | 
	
	
		
			
			|  | @@ -9042,7 +9042,7 @@ function install_final {
 | 
	
		
			
			| 9042 | 9042 |                       VoIP     5060
 | 
	
		
			
			| 9043 | 9043 |                       Tox      33445
 | 
	
		
			
			| 9044 | 9044 |                       IPFS     4001
 | 
	
		
			
			| 9045 |  | -'
 | 
	
		
			
			|  | 9045 | +"
 | 
	
		
			
			| 9046 | 9046 |    if [ -f "/home/$MY_USERNAME/README" ]; then
 | 
	
		
			
			| 9047 | 9047 |        echo $"See /home/$MY_USERNAME/README for post-installation instructions."
 | 
	
		
			
			| 9048 | 9048 |        echo ''
 | 
	
	
		
			
			|  | @@ -9157,5 +9157,5 @@ repair_databases_script
 | 
	
		
			
			| 9157 | 9157 |  backup_to_friends_servers
 | 
	
		
			
			| 9158 | 9158 |  intrusion_detection
 | 
	
		
			
			| 9159 | 9159 |  install_final
 | 
	
		
			
			| 9160 |  | -echo 'Freedombone installation is complete'
 | 
	
		
			
			|  | 9160 | +echo "${PROJECT_NAME} installation is complete"
 | 
	
		
			
			| 9161 | 9161 |  exit 0
 |