free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More translations

This commit is contained in:
Bob Mottram 2015-12-27 16:14:45 +00:00
parent d26522a029
commit 92493126a3
4 changed files with 374 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
locale/de/freedombone.json
View File

@ -30,11 +30,66 @@
"Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "", "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
"Forum address: $ZERONET_FORUM_ADDRESS": "", "Forum address: $ZERONET_FORUM_ADDRESS": "",
"Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "", "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
"OneRNG package could not be downloaded": "",
"OneRNG package: $ONERNG_PACKAGE": "",
"Hash does not match. This could indicate that the package has been tampered with.": "",
"OneRNG expected package hash: $ONERNG_PACKAGE_HASH": "",
"OneRNG actual hash: $hash": "",
"OneRNG Device": "",
"Please plug in the OneRNG device": "",
"Public key: $MY_GPG_PUBLIC_KEY": "", "Public key: $MY_GPG_PUBLIC_KEY": "",
"Private key: $MY_GPG_PRIVATE_KEY": "", "Private key: $MY_GPG_PRIVATE_KEY": "",
"GPG public key file $MY_GPG_PUBLIC_KEY was not found": "", "GPG public key file $MY_GPG_PUBLIC_KEY was not found": "",
"GPG private key file $MY_GPG_PRIVATE_KEY was not found": "", "GPG private key file $MY_GPG_PRIVATE_KEY was not found": "",
"The GPG key for $MY_EMAIL_ADDRESS could not be imported": "", "The GPG key for $MY_EMAIL_ADDRESS could not be imported": "",
"A GPG key for $MY_EMAIL_ADDRESS could not be created": "", "A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
"If you have imported legacy email which is not encrypted": "",
"Your MariaDB password is: $MARIADB_PASSWORD": "",
"Music player in Owncloud": "",
" *** Freedombone $SYSTEM_TYPE is now installed ***": "",
"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
"Owncloud install did not recognise the system type $SYSTEM_TYPE": "",
"Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD": "",
"the Users dropdown menu entry. The username should be '$MY_USERNAME'.": "",
"the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME": "",
"Gogs admin user password": "",
"Database password: $MARIADB_PASSWORD": "",
"Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
"Gogs admin user email: $MY_EMAIL_ADDRESS": "",
"Note that there's a usability/security trade-off made here.": "",
"In order to allow git clone via http we don't redirect everything": "",
"should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https.": "",
"File not found /usr/local/bin/tox-bootstrapd": "",
"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": "",
"Your Tox node public key is: $TOX_PUBLIC_KEY": "",
"Your XMPP password is: $XMPP_PASSWORD": "",
"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
"Wiki password": "",
"Wiki username: $MY_USERNAME": "",
"Wiki password: $WIKI_ADMIN_PASSWORD": "",
"Your blog username: $MY_USERNAME": "",
"Your blog password is: $FULLBLOG_ADMIN_PASSWORD": "",
"Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login": "",
"Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD": "",
"To set up your microblog go to": "",
"https://$MICROBLOG_DOMAIN_NAME/install.php": "",
" - DB Password; $MARIADB_PASSWORD": "",
" - Administrator nickname: $MY_USERNAME": "",
" - Administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
"https://$MICROBLOG_DOMAIN_NAME and you can then ": "",
"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
"To set up your Hubzilla site go to": "",
"to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt": "",
"and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key.": "",
"Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt": "",
"within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME": "",
"ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
"VoIP Server": "",
"VoIP server password: $VOIP_SERVER_PASSWORD": "",
"SIP Server": "",
"SIP server username: $MY_USERNAME": "",
"SIP server extension: 201": "",
"SIP server password: $SIP_SERVER_PASSWORD": "",
"See /home/$MY_USERNAME/README for post-installation instructions.": "" "See /home/$MY_USERNAME/README for post-installation instructions.": ""
} }

55
locale/es/freedombone.json
View File

@ -30,11 +30,66 @@
"Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "", "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
"Forum address: $ZERONET_FORUM_ADDRESS": "", "Forum address: $ZERONET_FORUM_ADDRESS": "",
"Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "", "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
"OneRNG package could not be downloaded": "",
"OneRNG package: $ONERNG_PACKAGE": "",
"Hash does not match. This could indicate that the package has been tampered with.": "",
"OneRNG expected package hash: $ONERNG_PACKAGE_HASH": "",
"OneRNG actual hash: $hash": "",
"OneRNG Device": "",
"Please plug in the OneRNG device": "",
"Public key: $MY_GPG_PUBLIC_KEY": "", "Public key: $MY_GPG_PUBLIC_KEY": "",
"Private key: $MY_GPG_PRIVATE_KEY": "", "Private key: $MY_GPG_PRIVATE_KEY": "",
"GPG public key file $MY_GPG_PUBLIC_KEY was not found": "", "GPG public key file $MY_GPG_PUBLIC_KEY was not found": "",
"GPG private key file $MY_GPG_PRIVATE_KEY was not found": "", "GPG private key file $MY_GPG_PRIVATE_KEY was not found": "",
"The GPG key for $MY_EMAIL_ADDRESS could not be imported": "", "The GPG key for $MY_EMAIL_ADDRESS could not be imported": "",
"A GPG key for $MY_EMAIL_ADDRESS could not be created": "", "A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
"If you have imported legacy email which is not encrypted": "",
"Your MariaDB password is: $MARIADB_PASSWORD": "",
"Music player in Owncloud": "",
" *** Freedombone $SYSTEM_TYPE is now installed ***": "",
"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
"Owncloud install did not recognise the system type $SYSTEM_TYPE": "",
"Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD": "",
"the Users dropdown menu entry. The username should be '$MY_USERNAME'.": "",
"the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME": "",
"Gogs admin user password": "",
"Database password: $MARIADB_PASSWORD": "",
"Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
"Gogs admin user email: $MY_EMAIL_ADDRESS": "",
"Note that there's a usability/security trade-off made here.": "",
"In order to allow git clone via http we don't redirect everything": "",
"should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https.": "",
"File not found /usr/local/bin/tox-bootstrapd": "",
"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": "",
"Your Tox node public key is: $TOX_PUBLIC_KEY": "",
"Your XMPP password is: $XMPP_PASSWORD": "",
"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
"Wiki password": "",
"Wiki username: $MY_USERNAME": "",
"Wiki password: $WIKI_ADMIN_PASSWORD": "",
"Your blog username: $MY_USERNAME": "",
"Your blog password is: $FULLBLOG_ADMIN_PASSWORD": "",
"Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login": "",
"Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD": "",
"To set up your microblog go to": "",
"https://$MICROBLOG_DOMAIN_NAME/install.php": "",
" - DB Password; $MARIADB_PASSWORD": "",
" - Administrator nickname: $MY_USERNAME": "",
" - Administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
"https://$MICROBLOG_DOMAIN_NAME and you can then ": "",
"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
"To set up your Hubzilla site go to": "",
"to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt": "",
"and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key.": "",
"Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt": "",
"within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME": "",
"ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
"VoIP Server": "",
"VoIP server password: $VOIP_SERVER_PASSWORD": "",
"SIP Server": "",
"SIP server username: $MY_USERNAME": "",
"SIP server extension: 201": "",
"SIP server password: $SIP_SERVER_PASSWORD": "",
"See /home/$MY_USERNAME/README for post-installation instructions.": "" "See /home/$MY_USERNAME/README for post-installation instructions.": ""
} }

55
locale/fr/freedombone.json
View File

@ -30,11 +30,66 @@
"Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "", "Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
"Forum address: $ZERONET_FORUM_ADDRESS": "", "Forum address: $ZERONET_FORUM_ADDRESS": "",
"Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "", "Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
"OneRNG package could not be downloaded": "",
"OneRNG package: $ONERNG_PACKAGE": "",
"Hash does not match. This could indicate that the package has been tampered with.": "",
"OneRNG expected package hash: $ONERNG_PACKAGE_HASH": "",
"OneRNG actual hash: $hash": "",
"OneRNG Device": "",
"Please plug in the OneRNG device": "",
"Public key: $MY_GPG_PUBLIC_KEY": "", "Public key: $MY_GPG_PUBLIC_KEY": "",
"Private key: $MY_GPG_PRIVATE_KEY": "", "Private key: $MY_GPG_PRIVATE_KEY": "",
"GPG public key file $MY_GPG_PUBLIC_KEY was not found": "", "GPG public key file $MY_GPG_PUBLIC_KEY was not found": "",
"GPG private key file $MY_GPG_PRIVATE_KEY was not found": "", "GPG private key file $MY_GPG_PRIVATE_KEY was not found": "",
"The GPG key for $MY_EMAIL_ADDRESS could not be imported": "", "The GPG key for $MY_EMAIL_ADDRESS could not be imported": "",
"A GPG key for $MY_EMAIL_ADDRESS could not be created": "", "A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
"If you have imported legacy email which is not encrypted": "",
"Your MariaDB password is: $MARIADB_PASSWORD": "",
"Music player in Owncloud": "",
" *** Freedombone $SYSTEM_TYPE is now installed ***": "",
"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
"Owncloud install did not recognise the system type $SYSTEM_TYPE": "",
"Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD": "",
"the Users dropdown menu entry. The username should be '$MY_USERNAME'.": "",
"the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME": "",
"Gogs admin user password": "",
"Database password: $MARIADB_PASSWORD": "",
"Gogs admin user password: $GIT_ADMIN_PASSWORD": "",
"Gogs admin user email: $MY_EMAIL_ADDRESS": "",
"Note that there's a usability/security trade-off made here.": "",
"In order to allow git clone via http we don't redirect everything": "",
"should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https.": "",
"File not found /usr/local/bin/tox-bootstrapd": "",
"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf": "",
"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service": "",
"Your Tox node public key is: $TOX_PUBLIC_KEY": "",
"Your XMPP password is: $XMPP_PASSWORD": "",
"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
"Wiki password": "",
"Wiki username: $MY_USERNAME": "",
"Wiki password: $WIKI_ADMIN_PASSWORD": "",
"Your blog username: $MY_USERNAME": "",
"Your blog password is: $FULLBLOG_ADMIN_PASSWORD": "",
"Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login": "",
"Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD": "",
"To set up your microblog go to": "",
"https://$MICROBLOG_DOMAIN_NAME/install.php": "",
" - DB Password; $MARIADB_PASSWORD": "",
" - Administrator nickname: $MY_USERNAME": "",
" - Administrator password: $MICROBLOG_ADMIN_PASSWORD": "",
"https://$MICROBLOG_DOMAIN_NAME and you can then ": "",
"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD": "",
"To set up your Hubzilla site go to": "",
"to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt": "",
"and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key.": "",
"Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt": "",
"within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME": "",
"ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE": "",
"VoIP Server": "",
"VoIP server password: $VOIP_SERVER_PASSWORD": "",
"SIP Server": "",
"SIP server username: $MY_USERNAME": "",
"SIP server extension: 201": "",
"SIP server password: $SIP_SERVER_PASSWORD": "",
"See /home/$MY_USERNAME/README for post-installation instructions.": "" "See /home/$MY_USERNAME/README for post-installation instructions.": ""
} }

419
src/freedombone
View File

@ -1222,19 +1222,19 @@ function check_domains {
test_domain_name "$WIKI_DOMAIN_NAME" test_domain_name "$WIKI_DOMAIN_NAME"
if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
echo 'Wiki domain name is the same as Owncloud domain name. They must be different' echo $'Wiki domain name is the same as Owncloud domain name. They must be different'
exit 73863 exit 73863
fi fi
if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then
echo 'Wiki domain name is the same as blog domain name. They must be different' echo $'Wiki domain name is the same as blog domain name. They must be different'
exit 97326 exit 97326
fi fi
if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then
echo 'Wiki domain name is the same as microblog domain name. They must be different' echo $'Wiki domain name is the same as microblog domain name. They must be different'
exit 36827 exit 36827
fi fi
if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then
echo 'Wiki domain name is the same as hubzilla domain name. They must be different' echo $'Wiki domain name is the same as hubzilla domain name. They must be different'
exit 65848 exit 65848
fi fi
fi fi
@ -1243,19 +1243,19 @@ function check_domains {
test_domain_name "$OWNCLOUD_DOMAIN_NAME" test_domain_name "$OWNCLOUD_DOMAIN_NAME"
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
echo 'Owncloud domain name is the same as wiki domain name. They must be different' echo $'Owncloud domain name is the same as wiki domain name. They must be different'
exit 37994 exit 37994
fi fi
if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then
echo 'Owncloud domain name is the same as blog domain name. They must be different' echo $'Owncloud domain name is the same as blog domain name. They must be different'
exit 37936 exit 37936
fi fi
if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then
echo 'Owncloud domain name is the same as microblog domain name. They must be different' echo $'Owncloud domain name is the same as microblog domain name. They must be different'
exit 36896 exit 36896
fi fi
if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then
echo 'Owncloud domain name is the same as hubzilla domain name. They must be different' echo $'Owncloud domain name is the same as hubzilla domain name. They must be different'
exit 68365 exit 68365
fi fi
fi fi
@ -1264,19 +1264,19 @@ function check_domains {
test_domain_name "$FULLBLOG_DOMAIN_NAME" test_domain_name "$FULLBLOG_DOMAIN_NAME"
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
echo 'Blog domain name is the same as wiki domain name. They must be different' echo $'Blog domain name is the same as wiki domain name. They must be different'
exit 62348 exit 62348
fi fi
if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
echo 'Blog domain name is the same as Owncloud domain name. They must be different' echo $'Blog domain name is the same as Owncloud domain name. They must be different'
exit 84682 exit 84682
fi fi
if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then
echo 'Blog domain name is the same as microblog domain name. They must be different' echo $'Blog domain name is the same as microblog domain name. They must be different'
exit 38236 exit 38236
fi fi
if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then
echo 'Blog domain name is the same as hubzilla domain name. They must be different' echo $'Blog domain name is the same as hubzilla domain name. They must be different'
exit 35483 exit 35483
fi fi
fi fi
@ -1285,19 +1285,19 @@ function check_domains {
test_domain_name "$MICROBLOG_DOMAIN_NAME" test_domain_name "$MICROBLOG_DOMAIN_NAME"
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
echo 'Microblog domain name is the same as wiki domain name. They must be different' echo $'Microblog domain name is the same as wiki domain name. They must be different'
exit 73924 exit 73924
fi fi
if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
echo 'Microblog domain name is the same as Owncloud domain name. They must be different' echo $'Microblog domain name is the same as Owncloud domain name. They must be different'
exit 73683 exit 73683
fi fi
if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then
echo 'Microblog domain name is the same as blog domain name. They must be different' echo $'Microblog domain name is the same as blog domain name. They must be different'
exit 26832 exit 26832
fi fi
if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$HUBZILLA_DOMAIN_NAME" ]]; then
echo 'Microblog domain name is the same as hubzilla domain name. They must be different' echo $'Microblog domain name is the same as hubzilla domain name. They must be different'
exit 678382 exit 678382
fi fi
fi fi
@ -1306,19 +1306,19 @@ function check_domains {
test_domain_name "$HUBZILLA_DOMAIN_NAME" test_domain_name "$HUBZILLA_DOMAIN_NAME"
if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$WIKI_DOMAIN_NAME" ]]; then
echo 'Hubzilla domain name is the same as wiki domain name. They must be different' echo $'Hubzilla domain name is the same as wiki domain name. They must be different'
exit 83682 exit 83682
fi fi
if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$OWNCLOUD_DOMAIN_NAME" ]]; then
echo 'Hubzilla domain name is the same as Owncloud domain name. They must be different' echo $'Hubzilla domain name is the same as Owncloud domain name. They must be different'
exit 65192 exit 65192
fi fi
if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$FULLBLOG_DOMAIN_NAME" ]]; then
echo 'Hubzilla domain name is the same as blog domain name. They must be different' echo $'Hubzilla domain name is the same as blog domain name. They must be different'
exit 74817 exit 74817
fi fi
if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then if [[ "$test_domain_name" == "$MICROBLOG_DOMAIN_NAME" ]]; then
echo 'Hubzilla domain name is the same as microblog domain name. They must be different' echo $'Hubzilla domain name is the same as microblog domain name. They must be different'
exit 83683 exit 83683
fi fi
fi fi
@ -2818,8 +2818,8 @@ function check_hwrng {
# suffer from low entropy and might be insecure # suffer from low entropy and might be insecure
if [ ! -e /dev/hwrng ]; then if [ ! -e /dev/hwrng ]; then
ls /dev/hw* ls /dev/hw*
echo 'The hardware random number generator is enabled but could not be detected on' echo $'The hardware random number generator is enabled but could not be detected on'
echo '/dev/hwrng. There may be a problem with the installation or the Beaglebone hardware.' echo $'/dev/hwrng. There may be a problem with the installation or the Beaglebone hardware.'
exit 75 exit 75
fi fi
fi fi
@ -3001,38 +3001,38 @@ function change_login_message {
echo "' ' --' --' -' - -' ' ' -' -' -' ' - --'" >> /etc/motd echo "' ' --' --' -' - -' ' ' -' -' -' ' - --'" >> /etc/motd
if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then
echo ' M A I L B O X E D I T I O N' >> /etc/motd echo $' M A I L B O X E D I T I O N' >> /etc/motd
fi fi
if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then
echo ' S O C I A L E D I T I O N' >> /etc/motd echo $' S O C I A L E D I T I O N' >> /etc/motd
fi fi
if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
echo ' C H A T E D I T I O N' >> /etc/motd echo $' C H A T E D I T I O N' >> /etc/motd
fi fi
if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
echo ' C L O U D E D I T I O N' >> /etc/motd echo $' C L O U D E D I T I O N' >> /etc/motd
fi fi
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" ]]; then
echo ' W R I T E R E D I T I O N ' >> /etc/motd echo $' W R I T E R E D I T I O N ' >> /etc/motd
fi fi
if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_MEDIA" ]]; then
echo ' M E D I A E D I T I O N' >> /etc/motd echo $' M E D I A E D I T I O N' >> /etc/motd
fi fi
if [[ $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
echo ' D E V E L O P E R E D I T I O N' >> /etc/motd echo $' D E V E L O P E R E D I T I O N' >> /etc/motd
fi fi
echo '' >> /etc/motd echo '' >> /etc/motd
if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
echo ' Freedom in the Cloud' >> /etc/motd echo $' Freedom in the Cloud' >> /etc/motd
else else
echo ' Freedom in the Mesh' >> /etc/motd echo $' Freedom in the Mesh' >> /etc/motd
fi fi
echo '' >> /etc/motd echo '' >> /etc/motd
echo 'change_login_message' >> $COMPLETION_FILE echo 'change_login_message' >> $COMPLETION_FILE
@ -3191,7 +3191,7 @@ function install_editor {
#echo -n "(add-to-list 'load-path " > /home/$MY_USERNAME/.emacs #echo -n "(add-to-list 'load-path " > /home/$MY_USERNAME/.emacs
#echo '"~/.emacs.d/")' >> /home/$MY_USERNAME/.emacs #echo '"~/.emacs.d/")' >> /home/$MY_USERNAME/.emacs
#echo '' >> /home/$MY_USERNAME/.emacs #echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Remove trailing whitepace ======================================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Remove trailing whitepace ======================================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ";;(add-hook 'before-save-hook 'delete-trailing-whitespace)" >> /home/$MY_USERNAME/.emacs echo ";;(add-hook 'before-save-hook 'delete-trailing-whitespace)" >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
@ -3199,50 +3199,50 @@ function install_editor {
echo -n '(global-set-key "\C-l" ' >> /home/$MY_USERNAME/.emacs echo -n '(global-set-key "\C-l" ' >> /home/$MY_USERNAME/.emacs
echo "'goto-line)" >> /home/$MY_USERNAME/.emacs echo "'goto-line)" >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Show line numbers ==============================================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Show line numbers ==============================================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo "(add-hook 'find-file-hook (lambda () (linum-mode 1)))" >> /home/$MY_USERNAME/.emacs echo "(add-hook 'find-file-hook (lambda () (linum-mode 1)))" >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Enable line wrapping in org-mode ===============================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Enable line wrapping in org-mode ===============================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo " (add-hook 'org-mode-hook" >> /home/$MY_USERNAME/.emacs echo " (add-hook 'org-mode-hook" >> /home/$MY_USERNAME/.emacs
echo " '(lambda ()" >> /home/$MY_USERNAME/.emacs echo " '(lambda ()" >> /home/$MY_USERNAME/.emacs
echo " (visual-line-mode 1)))" >> /home/$MY_USERNAME/.emacs echo " (visual-line-mode 1)))" >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Enable shift select in org mode ================================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Enable shift select in org mode ================================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo '(setq org-support-shift-select t)' >> /home/$MY_USERNAME/.emacs echo '(setq org-support-shift-select t)' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Set standard indent to 4 rather that 4 =========================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Set standard indent to 4 rather that 4 =========================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo '(setq standard-indent 4)' >> /home/$MY_USERNAME/.emacs echo '(setq standard-indent 4)' >> /home/$MY_USERNAME/.emacs
echo '(setq-default tab-width 4)' >> /home/$MY_USERNAME/.emacs echo '(setq-default tab-width 4)' >> /home/$MY_USERNAME/.emacs
echo '(setq c-basic-offset 4)' >> /home/$MY_USERNAME/.emacs echo '(setq c-basic-offset 4)' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Support Wheel Mouse Scrolling ==================================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Support Wheel Mouse Scrolling ==================================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo '(mouse-wheel-mode t)' >> /home/$MY_USERNAME/.emacs echo '(mouse-wheel-mode t)' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Place Backup Files in Specific Directory =======================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Place Backup Files in Specific Directory =======================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo '(setq make-backup-files t)' >> /home/$MY_USERNAME/.emacs echo '(setq make-backup-files t)' >> /home/$MY_USERNAME/.emacs
echo '(setq version-control t)' >> /home/$MY_USERNAME/.emacs echo '(setq version-control t)' >> /home/$MY_USERNAME/.emacs
echo '(setq backup-directory-alist (quote ((".*" . "~/.emacs_backups/"))))' >> /home/$MY_USERNAME/.emacs echo '(setq backup-directory-alist (quote ((".*" . "~/.emacs_backups/"))))' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Make Text mode the default mode for new buffers ================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Make Text mode the default mode for new buffers ================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo "(setq default-major-mode 'text-mode)" >> /home/$MY_USERNAME/.emacs echo "(setq default-major-mode 'text-mode)" >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Line length ====================================================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Line length ====================================================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo '(setq-default fill-column 72)' >> /home/$MY_USERNAME/.emacs echo '(setq-default fill-column 72)' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Enable Line and Column Numbering ===============================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Enable Line and Column Numbering ===============================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo '(line-number-mode 1)' >> /home/$MY_USERNAME/.emacs echo '(line-number-mode 1)' >> /home/$MY_USERNAME/.emacs
echo '(column-number-mode 1)' >> /home/$MY_USERNAME/.emacs echo '(column-number-mode 1)' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Turn on Auto Fill mode automatically in all modes ==============' >> /home/$MY_USERNAME/.emacs echo $';; ===== Turn on Auto Fill mode automatically in all modes ==============' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; Auto-fill-mode the the automatic wrapping of lines and insertion of' >> /home/$MY_USERNAME/.emacs echo ';; Auto-fill-mode the the automatic wrapping of lines and insertion of' >> /home/$MY_USERNAME/.emacs
echo ';; newlines when the cursor goes over the column limit.' >> /home/$MY_USERNAME/.emacs echo ';; newlines when the cursor goes over the column limit.' >> /home/$MY_USERNAME/.emacs
@ -3253,7 +3253,7 @@ function install_editor {
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo '(setq auto-fill-mode 1)' >> /home/$MY_USERNAME/.emacs echo '(setq auto-fill-mode 1)' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo ';; ===== Enable GPG encryption =========================================' >> /home/$MY_USERNAME/.emacs echo $';; ===== Enable GPG encryption =========================================' >> /home/$MY_USERNAME/.emacs
echo '' >> /home/$MY_USERNAME/.emacs echo '' >> /home/$MY_USERNAME/.emacs
echo "(require 'epa)" >> /home/$MY_USERNAME/.emacs echo "(require 'epa)" >> /home/$MY_USERNAME/.emacs
echo '(epa-file-enable)' >> /home/$MY_USERNAME/.emacs echo '(epa-file-enable)' >> /home/$MY_USERNAME/.emacs
@ -3295,17 +3295,17 @@ function check_onerng_verification {
if [[ $HWRNG_TYPE != "onerng" ]]; then if [[ $HWRNG_TYPE != "onerng" ]]; then
return return
fi fi
echo 'Checking OneRNG firmware verification' echo $'Checking OneRNG firmware verification'
last_onerng_validation=$(cat /var/log/syslog.1 | grep "OneRNG: firmware verification" | awk '/./{line=$0} END{print line}') last_onerng_validation=$(cat /var/log/syslog.1 | grep "OneRNG: firmware verification" | awk '/./{line=$0} END{print line}')
if [[ $last_onerng_validation != *"passed OK"* ]]; then if [[ $last_onerng_validation != *"passed OK"* ]]; then
last_onerng_validation=$(cat /var/log/syslog | grep "OneRNG: firmware verification" | awk '/./{line=$0} END{print line}') last_onerng_validation=$(cat /var/log/syslog | grep "OneRNG: firmware verification" | awk '/./{line=$0} END{print line}')
if [[ $last_onerng_validation != *"passed OK"* ]]; then if [[ $last_onerng_validation != *"passed OK"* ]]; then
echo $last_onerng_validation echo $last_onerng_validation
echo 'OneRNG firmware verification failed' echo $'OneRNG firmware verification failed'
exit 735026 exit 735026
fi fi
fi fi
echo 'OneRNG firmware verification passed' echo $'OneRNG firmware verification passed'
# if haveged was previously installed then remove it # if haveged was previously installed then remove it
apt-get -y remove haveged apt-get -y remove haveged
echo 'check_onerng_verification' >> $COMPLETION_FILE echo 'check_onerng_verification' >> $COMPLETION_FILE
@ -3326,17 +3326,17 @@ function install_onerng {
mv "$ONERNG_PACKAGE?raw=true" $ONERNG_PACKAGE mv "$ONERNG_PACKAGE?raw=true" $ONERNG_PACKAGE
fi fi
if [ ! -f $ONERNG_PACKAGE ]; then if [ ! -f $ONERNG_PACKAGE ]; then
echo "OneRNG package could not be downloaded" echo $"OneRNG package could not be downloaded"
exit 59249 exit 59249
fi fi
# Check the hash # Check the hash
hash=$(sha256sum $ONERNG_PACKAGE | awk -F ' ' '{print $1}') hash=$(sha256sum $ONERNG_PACKAGE | awk -F ' ' '{print $1}')
if [[ $hash != $ONERNG_PACKAGE_HASH ]]; then if [[ $hash != $ONERNG_PACKAGE_HASH ]]; then
echo "OneRNG package: $ONERNG_PACKAGE" echo $"OneRNG package: $ONERNG_PACKAGE"
echo "Hash does not match. This could indicate that the package has been tampered with." echo $"Hash does not match. This could indicate that the package has been tampered with."
echo "OneRNG expected package hash: $ONERNG_PACKAGE_HASH" echo $"OneRNG expected package hash: $ONERNG_PACKAGE_HASH"
echo "OneRNG actual hash: $hash" echo $"OneRNG actual hash: $hash"
exit 25934 exit 25934
fi fi
@ -3345,12 +3345,12 @@ function install_onerng {
# Check that the install worked # Check that the install worked
if [ ! -f /etc/onerng.conf ]; then if [ ! -f /etc/onerng.conf ]; then
echo 'OneRNG configuration file not found. The package may not have installed successfully.' echo $'OneRNG configuration file not found. The package may not have installed successfully.'
exit 42904 exit 42904
fi fi
dialog --title "OneRNG Device" \ dialog --title $"OneRNG Device" \
--msgbox "Please plug in the OneRNG device" 6 40 --msgbox $"Please plug in the OneRNG device" 6 40
# check rng-tools configuration # check rng-tools configuration
if ! grep -q "/dev/$ONERNG_DEVICE" /etc/default/rng-tools; then if ! grep -q "/dev/$ONERNG_DEVICE" /etc/default/rng-tools; then
@ -4155,24 +4155,24 @@ function spam_filtering {
# user preferences # user preferences
if [ ! -d /home/$MY_USERNAME/.spamassassin ]; then if [ ! -d /home/$MY_USERNAME/.spamassassin ]; then
mkdir /home/$MY_USERNAME/.spamassassin mkdir /home/$MY_USERNAME/.spamassassin
echo '# How many points before a mail is considered spam.' > /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# How many points before a mail is considered spam.' > /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# required_score 5' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# required_score 5' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# Whitelist and blacklist addresses are now file-glob-style patterns, so' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# Whitelist and blacklist addresses are now file-glob-style patterns, so' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# "friend@somewhere.com", "*@isp.com", or "*.domain.net" will all work.' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# "friend@somewhere.com", "*@isp.com", or "*.domain.net" will all work.' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# whitelist_from someone@somewhere.com' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# whitelist_from someone@somewhere.com' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# Add your own customised scores for some tests below. The default scores are' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# Add your own customised scores for some tests below. The default scores are' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# read from the installed spamassassin rules files, but you can override them' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# read from the installed spamassassin rules files, but you can override them' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# here. To see the list of tests and their default scores, go to' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# here. To see the list of tests and their default scores, go to' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# http://spamassassin.apache.org/tests.html .' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# http://spamassassin.apache.org/tests.html .' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '#' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '#' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# score SYMBOLIC_TEST_NAME n.nn' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# score SYMBOLIC_TEST_NAME n.nn' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# Speakers of Asian languages, like Chinese, Japanese and Korean, will almost' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# Speakers of Asian languages, like Chinese, Japanese and Korean, will almost' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# definitely want to uncomment the following lines. They will switch off some' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# definitely want to uncomment the following lines. They will switch off some' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# rules that detect 8-bit characters, which commonly trigger on mails using CJK' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# rules that detect 8-bit characters, which commonly trigger on mails using CJK' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# character sets, or that assume a western-style charset is in use. ' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# character sets, or that assume a western-style charset is in use. ' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# ' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# ' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# score HTML_COMMENT_8BITS 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# score HTML_COMMENT_8BITS 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# score UPPERCASE_25_50 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# score UPPERCASE_25_50 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
@ -4180,10 +4180,10 @@ function spam_filtering {
echo '# score UPPERCASE_75_100 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# score UPPERCASE_75_100 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# score OBSCURED_EMAIL 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# score OBSCURED_EMAIL 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# Speakers of any language that uses non-English, accented characters may wish' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# Speakers of any language that uses non-English, accented characters may wish' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# to uncomment the following lines. They turn off rules that fire on' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# to uncomment the following lines. They turn off rules that fire on' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# misformatted messages generated by common mail apps in contravention of the' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# misformatted messages generated by common mail apps in contravention of the' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# email RFCs.' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo $'# email RFCs.' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '' >> /home/$MY_USERNAME/.spamassassin/user_prefs
echo '# score SUBJ_ILLEGAL_CHARS 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs echo '# score SUBJ_ILLEGAL_CHARS 0' >> /home/$MY_USERNAME/.spamassassin/user_prefs
fi fi
@ -4718,7 +4718,7 @@ function encrypt_outgoing_email {
if ! grep -q "pgp_encrypt_only_command" /home/$MY_USERNAME/.muttrc; then if ! grep -q "pgp_encrypt_only_command" /home/$MY_USERNAME/.muttrc; then
echo '' >> /home/$MY_USERNAME/.muttrc echo '' >> /home/$MY_USERNAME/.muttrc
echo '# Encrypt items in the Sent folder' >> /home/$MY_USERNAME/.muttrc echo $'# Encrypt items in the Sent folder' >> /home/$MY_USERNAME/.muttrc
echo "set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"" >> /home/$MY_USERNAME/.muttrc echo "set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"" >> /home/$MY_USERNAME/.muttrc
else else
sed -i "s|set pgp_encrypt_only_command.*|set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"|g" /home/$MY_USERNAME/.muttrc sed -i "s|set pgp_encrypt_only_command.*|set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"|g" /home/$MY_USERNAME/.muttrc
@ -4755,19 +4755,19 @@ function encrypt_all_email {
if [ ! /home/$MY_USERNAME/README ]; then if [ ! /home/$MY_USERNAME/README ]; then
touch /home/$MY_USERNAME/README touch /home/$MY_USERNAME/README
fi fi
if ! grep -q "If you have imported legacy email" /home/$MY_USERNAME/README; then if ! grep -q $"If you have imported legacy email which is not encrypted" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Encrypting legacy email' >> /home/$MY_USERNAME/README echo $'Encrypting legacy email' >> /home/$MY_USERNAME/README
echo '=======================' >> /home/$MY_USERNAME/README echo '=======================' >> /home/$MY_USERNAME/README
echo 'If you have imported legacy email which is not encrypted' >> /home/$MY_USERNAME/README echo $'If you have imported legacy email which is not encrypted' >> /home/$MY_USERNAME/README
echo 'then it can be encrypted with the command:' >> /home/$MY_USERNAME/README echo $'then it can be encrypted with the command:' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo ' encmaildir' >> /home/$MY_USERNAME/README echo ' encmaildir' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'But be warned that depending upon how much email you have' >> /home/$MY_USERNAME/README echo $'But be warned that depending upon how much email you have' >> /home/$MY_USERNAME/README
echo 'this could take a seriously LONG time on the Beaglebone' >> /home/$MY_USERNAME/README echo $'this could take a seriously LONG time on the Beaglebone' >> /home/$MY_USERNAME/README
echo 'and may be better done on a faster machine.' >> /home/$MY_USERNAME/README echo $'and may be better done on a faster machine.' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
fi fi
@ -5112,14 +5112,13 @@ function create_private_mailing_list {
return return
fi fi
if [[ $PRIVATE_MAILING_LIST == $MY_USERNAME ]]; then if [[ $PRIVATE_MAILING_LIST == $MY_USERNAME ]]; then
echo 'The name of the private mailing list should not be the' echo $'The name of the private mailing list should not be the same as your username'
echo 'same as your username'
exit 10 exit 10
fi fi
if [ ! $MY_GPG_PUBLIC_KEY ]; then if [ ! $MY_GPG_PUBLIC_KEY ]; then
echo 'To create a private mailing list you need to specify a file' echo $'To create a private mailing list you need to specify a file'
echo 'containing your exported GPG key within MY_GPG_PUBLIC_KEY at' echo $'containing your exported GPG key within MY_GPG_PUBLIC_KEY at'
echo 'the top of the script' echo $'the top of the script'
exit 11 exit 11
fi fi
apt-get -y install ruby ruby-dev ruby-gpgme libgpgme11-dev libmagic-dev apt-get -y install ruby ruby-dev ruby-gpgme libgpgme11-dev libmagic-dev
@ -5222,7 +5221,7 @@ function import_email {
if [ -d $USB_MOUNT ]; then if [ -d $USB_MOUNT ]; then
umount $USB_MOUNT umount $USB_MOUNT
rm -rf $USB_MOUNT rm -rf $USB_MOUNT
echo ' You can now remove the USB drive' echo $' You can now remove the USB drive'
fi fi
exit 0 exit 0
fi fi
@ -5406,7 +5405,7 @@ function install_mariadb {
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'MariaDB / MySql' >> /home/$MY_USERNAME/README echo 'MariaDB / MySql' >> /home/$MY_USERNAME/README
echo '===============' >> /home/$MY_USERNAME/README echo '===============' >> /home/$MY_USERNAME/README
echo "Your MariaDB password is: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README echo $"Your MariaDB password is: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
@ -5498,7 +5497,7 @@ function install_owncloud_music_app {
fi fi
if ! grep -Fxq "install_owncloud" $COMPLETION_FILE; then if ! grep -Fxq "install_owncloud" $COMPLETION_FILE; then
echo 'Tried to install the Owncloud music app, but Owncloud installation was not found' echo $'Tried to install the Owncloud music app, but Owncloud installation was not found'
exit 9823 exit 9823
fi fi
@ -5533,16 +5532,16 @@ function install_owncloud_music_app {
sed -i "s/Owncloud music app commit.*/Owncloud music app commit:$OWNCLOUD_MUSIC_APP_COMMIT/g" $COMPLETION_FILE sed -i "s/Owncloud music app commit.*/Owncloud music app commit:$OWNCLOUD_MUSIC_APP_COMMIT/g" $COMPLETION_FILE
fi fi
if grep -q "Music player in Owncloud" /home/$MY_USERNAME/README; then if grep -q $"Music player in Owncloud" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Music player in Owncloud' >> /home/$MY_USERNAME/README echo $'Music player in Owncloud' >> /home/$MY_USERNAME/README
echo '========================' >> /home/$MY_USERNAME/README echo '========================' >> /home/$MY_USERNAME/README
echo 'To enable the music app within ouwncloud log in to the Owncloud' >> /home/$MY_USERNAME/README echo $'To enable the music app within ouwncloud log in to the Owncloud' >> /home/$MY_USERNAME/README
echo 'administrator account then go to Apps on the left hand dropdown' >> /home/$MY_USERNAME/README echo $'administrator account then go to Apps on the left hand dropdown' >> /home/$MY_USERNAME/README
echo 'menu and enable the music app. You can then log out and log back' >> /home/$MY_USERNAME/README echo $'menu and enable the music app. You can then log out and log back' >> /home/$MY_USERNAME/README
echo 'in as your Owncloud user and select music from the left hand' >> /home/$MY_USERNAME/README echo $'in as your Owncloud user and select music from the left hand' >> /home/$MY_USERNAME/README
echo 'dropdown menu.' >> /home/$MY_USERNAME/README echo $'dropdown menu.' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
fi fi
@ -5587,8 +5586,8 @@ function install_owncloud {
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 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
return return
fi fi
OWNCLOUD_COMPLETION_MSG1=" *** Freedombone $SYSTEM_TYPE is now installed ***" OWNCLOUD_COMPLETION_MSG1=$" *** Freedombone $SYSTEM_TYPE is now installed ***"
OWNCLOUD_COMPLETION_MSG2="Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup" OWNCLOUD_COMPLETION_MSG2=$"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup"
if grep -Fxq "install_owncloud" $COMPLETION_FILE; then if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
install_owncloud_music_app install_owncloud_music_app
@ -5610,17 +5609,17 @@ function install_owncloud {
# if this is exclusively a cloud setup # if this is exclusively a cloud setup
if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
if [ ! $DEFAULT_DOMAIN_NAME ]; then if [ ! $DEFAULT_DOMAIN_NAME ]; then
echo 'No default domain name when installing cloud variant' echo $'No default domain name when installing cloud variant'
exit 5380 exit 5380
fi fi
fi fi
if [ ! $OWNCLOUD_DOMAIN_NAME ]; then if [ ! $OWNCLOUD_DOMAIN_NAME ]; then
echo 'No Owncloud domain name was specified' echo $'No Owncloud domain name was specified'
exit 3095 exit 3095
fi fi
if [[ $SYSTEM_TYPE != "$VARIANT_CLOUD" ]]; then if [[ $SYSTEM_TYPE != "$VARIANT_CLOUD" ]]; then
if [[ $SYSTEM_TYPE != "$VARIANT_FULL" ]]; then if [[ $SYSTEM_TYPE != "$VARIANT_FULL" ]]; then
echo "Owncloud install did not recognise the system type $SYSTEM_TYPE" echo $"Owncloud install did not recognise the system type $SYSTEM_TYPE"
exit 6746 exit 6746
fi fi
fi fi
@ -5628,7 +5627,7 @@ function install_owncloud {
apt-get -y remove --purge apache* apt-get -y remove --purge apache*
if [ -d /etc/apache2 ]; then if [ -d /etc/apache2 ]; then
rm -rf /etc/apache2 rm -rf /etc/apache2
echo 'Removed Apache installation after Owncloud install' echo $'Removed Apache installation after Owncloud install'
fi fi
install_mariadb install_mariadb
get_mariadb_password get_mariadb_password
@ -5647,19 +5646,19 @@ function install_owncloud {
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Owncloud' >> /home/$MY_USERNAME/README echo 'Owncloud' >> /home/$MY_USERNAME/README
echo '========' >> /home/$MY_USERNAME/README echo '========' >> /home/$MY_USERNAME/README
echo 'Owncloud database user: owncloudadmin' >> /home/$MY_USERNAME/README echo $'Owncloud database user: owncloudadmin' >> /home/$MY_USERNAME/README
echo "Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README echo $"Owncloud database password: $OWNCLOUD_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
echo 'Owncloud database name: owncloud' >> /home/$MY_USERNAME/README echo $'Owncloud database name: owncloud' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'After creating an administrator account then create a user account via' >> /home/$MY_USERNAME/README echo $'After creating an administrator account then create a user account via' >> /home/$MY_USERNAME/README
echo "the Users dropdown menu entry. The username should be '$MY_USERNAME'." >> /home/$MY_USERNAME/README echo $"the Users dropdown menu entry. The username should be '$MY_USERNAME'." >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'On mobile devices you can download the Owncloud client via F-Droid.' >> /home/$MY_USERNAME/README echo $'On mobile devices you can download the Owncloud client via F-Droid.' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'To synchronise calendar entries with Android "install CalDAV Sync Adapter"' >> /home/$MY_USERNAME/README echo $'To synchronise calendar entries with Android "install CalDAV Sync Adapter"' >> /home/$MY_USERNAME/README
echo 'using F-Droid then go to settings/accounts and add a CalDav account with' >> /home/$MY_USERNAME/README echo $'using F-Droid then go to settings/accounts and add a CalDav account with' >> /home/$MY_USERNAME/README
echo "the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME" >> /home/$MY_USERNAME/README echo $"the URL https://$OWNCLOUD_DOMAIN_NAME/remote.php/caldav/principals/$MY_USERNAME" >> /home/$MY_USERNAME/README
echo 'and the username and password shown above.' >> /home/$MY_USERNAME/README echo $'and the username and password shown above.' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
fi fi
@ -5788,7 +5787,7 @@ quit" > $INSTALL_DIR/batch.sql
# backups are not being used # backups are not being used
backup_databases_script_header backup_databases_script_header
echo '' >> /usr/bin/backupdatabases echo '' >> /usr/bin/backupdatabases
echo '# Backup Owncloud database' >> /usr/bin/backupdatabases echo $'# Backup Owncloud database' >> /usr/bin/backupdatabases
echo 'TEMPFILE=/root/owncloud.sql' >> /usr/bin/backupdatabases echo 'TEMPFILE=/root/owncloud.sql' >> /usr/bin/backupdatabases
echo 'DAILYFILE=/var/backups/owncloud_daily.sql' >> /usr/bin/backupdatabases echo 'DAILYFILE=/var/backups/owncloud_daily.sql' >> /usr/bin/backupdatabases
echo 'mysqldump --password="$MYSQL_PASSWORD" owncloud > $TEMPFILE' >> /usr/bin/backupdatabases echo 'mysqldump --password="$MYSQL_PASSWORD" owncloud > $TEMPFILE' >> /usr/bin/backupdatabases
@ -5938,45 +5937,45 @@ function install_gogs {
fi fi
fi fi
if ! grep -q "Gogs admin user password" /home/$MY_USERNAME/README; then if ! grep -q $"Gogs admin user password" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Gogs' >> /home/$MY_USERNAME/README echo 'Gogs' >> /home/$MY_USERNAME/README
echo '====' >> /home/$MY_USERNAME/README echo '====' >> /home/$MY_USERNAME/README
echo 'Database type: MySql' >> /home/$MY_USERNAME/README echo $'Database type: MySql' >> /home/$MY_USERNAME/README
echo 'Database host: 127.0.0.1:3306' >> /home/$MY_USERNAME/README echo $'Database host: 127.0.0.1:3306' >> /home/$MY_USERNAME/README
echo 'Database user: root' >> /home/$MY_USERNAME/README echo $'Database user: root' >> /home/$MY_USERNAME/README
echo "Database password: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README echo $"Database password: $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
echo 'Database name: gogs' >> /home/$MY_USERNAME/README echo $'Database name: gogs' >> /home/$MY_USERNAME/README
echo 'Gogs admin user: gogsadmin' >> /home/$MY_USERNAME/README echo $'Gogs admin user: gogsadmin' >> /home/$MY_USERNAME/README
echo "Gogs admin user password: $GIT_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README echo $"Gogs admin user password: $GIT_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
echo "Gogs admin user email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README echo $"Gogs admin user email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Install Steps For First-time Run:' >> /home/$MY_USERNAME/README echo $'Install Steps For First-time Run:' >> /home/$MY_USERNAME/README
echo 'Leave email service settings empty' >> /home/$MY_USERNAME/README echo $'Leave email service settings empty' >> /home/$MY_USERNAME/README
echo 'Check "Enable Register Confirmation"' >> /home/$MY_USERNAME/README echo $'Check "Enable Register Confirmation"' >> /home/$MY_USERNAME/README
echo 'Check "Enable Mail Notification"' >> /home/$MY_USERNAME/README echo $'Check "Enable Mail Notification"' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'After the initial install edit /home/git/go/src/github.com/gogits/gogs/custom/conf/app.ini' >> /home/$MY_USERNAME/README echo $'After the initial install edit /home/git/go/src/github.com/gogits/gogs/custom/conf/app.ini' >> /home/$MY_USERNAME/README
echo 'and within the [server] section set:' >> /home/$MY_USERNAME/README echo $'and within the [server] section set:' >> /home/$MY_USERNAME/README
echo " DOMAIN = $GIT_DOMAIN_NAME" >> /home/$MY_USERNAME/README echo " DOMAIN = $GIT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
echo " ROOT_URL = http://$GIT_DOMAIN_NAME/" >> /home/$MY_USERNAME/README echo " ROOT_URL = http://$GIT_DOMAIN_NAME/" >> /home/$MY_USERNAME/README
echo " SSH_PORT = $SSH_PORT" >> /home/$MY_USERNAME/README echo " SSH_PORT = $SSH_PORT" >> /home/$MY_USERNAME/README
echo 'If you want to disable new account registrations then append the following:' >> /home/$MY_USERNAME/README echo $'If you want to disable new account registrations then append the following:' >> /home/$MY_USERNAME/README
echo ' [service]' >> /home/$MY_USERNAME/README echo ' [service]' >> /home/$MY_USERNAME/README
echo ' DISABLE_REGISTRATION = true' >> /home/$MY_USERNAME/README echo ' DISABLE_REGISTRATION = true' >> /home/$MY_USERNAME/README
echo 'Then restart with:' >> /home/$MY_USERNAME/README echo $'Then restart with:' >> /home/$MY_USERNAME/README
echo ' systemctl restart gogs' >> /home/$MY_USERNAME/README echo ' systemctl restart gogs' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo "Note that there's a usability/security trade-off made here." >> /home/$MY_USERNAME/README echo $"Note that there's a usability/security trade-off made here." >> /home/$MY_USERNAME/README
echo "In order to allow git clone via http we don't redirect everything" >> /home/$MY_USERNAME/README echo $"In order to allow git clone via http we don't redirect everything" >> /home/$MY_USERNAME/README
echo 'over https. Instead only critical things such as user login,' >> /home/$MY_USERNAME/README echo $'over https. Instead only critical things such as user login,' >> /home/$MY_USERNAME/README
echo 'settings and admin are encrypted.' >> /home/$MY_USERNAME/README echo $'settings and admin are encrypted.' >> /home/$MY_USERNAME/README
echo 'There are also potential security issues with cloning/pulling/pushing' >> /home/$MY_USERNAME/README echo $'There are also potential security issues with cloning/pulling/pushing' >> /home/$MY_USERNAME/README
echo 'code over http, since a determined adversary could inject malware' >> /home/$MY_USERNAME/README echo $'code over http, since a determined adversary could inject malware' >> /home/$MY_USERNAME/README
echo 'into the stream as it passes, so beware.' >> /home/$MY_USERNAME/README echo $'into the stream as it passes, so beware.' >> /home/$MY_USERNAME/README
echo 'If you have a bought domain and a non-self signed cert then you' >> /home/$MY_USERNAME/README echo $'If you have a bought domain and a non-self signed cert then you' >> /home/$MY_USERNAME/README
echo "should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https." >> /home/$MY_USERNAME/README echo $"should change /etc/nginx/sites-available/$GIT_DOMAIN_NAME to redirect everything over https." >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
fi fi
@ -6189,14 +6188,14 @@ function install_tox_node {
cp /usr/local/lib/libtoxcore* /usr/lib/ cp /usr/local/lib/libtoxcore* /usr/lib/
if [ ! -f /usr/local/bin/tox-bootstrapd ]; then if [ ! -f /usr/local/bin/tox-bootstrapd ]; then
echo "File not found /usr/local/bin/tox-bootstrapd" echo $"File not found /usr/local/bin/tox-bootstrapd"
exit 73862 exit 73862
fi fi
useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment "Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment "Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
chmod 700 /var/lib/tox-bootstrapd chmod 700 /var/lib/tox-bootstrapd
if [ ! -f $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf ]; then if [ ! -f $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf ]; then
echo "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf" echo $"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf"
exit 476835 exit 476835
fi fi
# remove Maildir # remove Maildir
@ -6245,7 +6244,7 @@ function install_tox_node {
fi fi
if [ ! -f $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service ]; then if [ ! -f $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service ]; then
echo "File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service" echo $"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service"
exit 7359 exit 7359
fi fi
cp $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service /etc/systemd/system/ cp $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service /etc/systemd/system/
@ -6263,7 +6262,7 @@ function install_tox_node {
systemctl restart tox-bootstrapd.service systemctl restart tox-bootstrapd.service
TOX_PUBLIC_KEY=$(cat /var/log/syslog | grep tox | grep "Public Key" | awk -F ' ' '{print $8}' | tail -1) TOX_PUBLIC_KEY=$(cat /var/log/syslog | grep tox | grep "Public Key" | awk -F ' ' '{print $8}' | tail -1)
if [ ${#TOX_PUBLIC_KEY} -lt 30 ]; then if [ ${#TOX_PUBLIC_KEY} -lt 30 ]; then
echo 'Could not obtain the tox node public key' echo $'Could not obtain the tox node public key'
exit 6529 exit 6529
fi fi
@ -6277,8 +6276,8 @@ function install_tox_node {
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Tox' >> /home/$MY_USERNAME/README echo 'Tox' >> /home/$MY_USERNAME/README
echo '===' >> /home/$MY_USERNAME/README echo '===' >> /home/$MY_USERNAME/README
echo "Your Tox node public key is: $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README echo $"Your Tox node public key is: $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README
echo 'In the Toxic client you can connect to it with:' >> /home/$MY_USERNAME/README echo $'In the Toxic client you can connect to it with:' >> /home/$MY_USERNAME/README
echo " /connect $DEFAULT_DOMAIN_NAME.local $TOX_PORT $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README echo " /connect $DEFAULT_DOMAIN_NAME.local $TOX_PORT $TOX_PUBLIC_KEY" >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
@ -6443,8 +6442,8 @@ function install_xmpp {
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'XMPP' >> /home/$MY_USERNAME/README echo 'XMPP' >> /home/$MY_USERNAME/README
echo '====' >> /home/$MY_USERNAME/README echo '====' >> /home/$MY_USERNAME/README
echo "Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README echo $"Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README
echo 'You can change it with: ' >> /home/$MY_USERNAME/README echo $'You can change it with: ' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo " prosodyctl passwd $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README echo " prosodyctl passwd $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
@ -6485,7 +6484,7 @@ function install_irc_server {
fi fi
if [ ! -d /etc/ngircd ]; then if [ ! -d /etc/ngircd ]; then
echo "ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE" echo $"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE"
exit 53 exit 53
fi fi
@ -6500,9 +6499,9 @@ function install_irc_server {
fi fi
echo '**************************************************' > /etc/ngircd/motd echo '**************************************************' > /etc/ngircd/motd
echo '* F R E E D O M B O N E I R C *' >> /etc/ngircd/motd echo $'* F R E E D O M B O N E I R C *' >> /etc/ngircd/motd
echo '* *' >> /etc/ngircd/motd echo '* *' >> /etc/ngircd/motd
echo '* Freedom in the Cloud *' >> /etc/ngircd/motd echo $'* Freedom in the Cloud *' >> /etc/ngircd/motd
echo '**************************************************' >> /etc/ngircd/motd echo '**************************************************' >> /etc/ngircd/motd
sed -i 's|MotdFile = /etc/ngircd/ngircd.motd|MotdFile = /etc/ngircd/motd|g' /etc/ngircd/ngircd.conf 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@irc.example.com/$MY_EMAIL_ADDRESS/g" /etc/ngircd/ngircd.conf
@ -6849,15 +6848,15 @@ function install_wiki {
add_ddns_domain add_ddns_domain
# add some post-install instructions # add some post-install instructions
if ! grep -q "Wiki password" /home/$MY_USERNAME/README; then if ! grep -q $"Wiki password" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Wiki' >> /home/$MY_USERNAME/README echo $'Wiki' >> /home/$MY_USERNAME/README
echo '====' >> /home/$MY_USERNAME/README echo '====' >> /home/$MY_USERNAME/README
echo "Wiki username: $MY_USERNAME" >> /home/$MY_USERNAME/README echo $"Wiki username: $MY_USERNAME" >> /home/$MY_USERNAME/README
echo "Wiki password: $WIKI_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README echo $"Wiki password: $WIKI_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Once you have set up the wiki then remove the install file:' >> /home/$MY_USERNAME/README echo $'Once you have set up the wiki then remove the install file:' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo " rm /var/www/$WIKI_DOMAIN_NAME/htdocs/install.php" >> /home/$MY_USERNAME/README echo " rm /var/www/$WIKI_DOMAIN_NAME/htdocs/install.php" >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
@ -6881,7 +6880,7 @@ function install_blog {
return return
fi fi
if [ ! $FULLBLOG_DOMAIN_NAME ]; then if [ ! $FULLBLOG_DOMAIN_NAME ]; then
echo 'The blog domain name was not specified' echo $'The blog domain name was not specified'
exit 5062 exit 5062
fi fi
@ -7126,12 +7125,12 @@ function install_blog {
fi fi
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'HTMLy Blog' >> /home/$MY_USERNAME/README echo $'HTMLy Blog' >> /home/$MY_USERNAME/README
echo '==========' >> /home/$MY_USERNAME/README echo '==========' >> /home/$MY_USERNAME/README
echo "Your blog username: $MY_USERNAME" >> /home/$MY_USERNAME/README echo $"Your blog username: $MY_USERNAME" >> /home/$MY_USERNAME/README
echo "Your blog password is: $FULLBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README echo $"Your blog password is: $FULLBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
echo "Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login" >> /home/$MY_USERNAME/README echo $"Log into your blog at https://$FULLBLOG_DOMAIN_NAME/login" >> /home/$MY_USERNAME/README
echo 'Edit your blog title and time zone at:' >> /home/$MY_USERNAME/README echo $'Edit your blog title and time zone at:' >> /home/$MY_USERNAME/README
echo " /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini" >> /home/$MY_USERNAME/README echo " /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/config.ini" >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
@ -7161,7 +7160,7 @@ function install_gnu_social {
return return
fi fi
if [ ! $MICROBLOG_DOMAIN_NAME ]; then if [ ! $MICROBLOG_DOMAIN_NAME ]; then
echo 'No domain name was given for the microblog' echo $'No domain name was given for the microblog'
exit 7359 exit 7359
fi fi
@ -7231,9 +7230,9 @@ function install_gnu_social {
fi fi
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'GNU Social' >> /home/$MY_USERNAME/README echo $'GNU Social' >> /home/$MY_USERNAME/README
echo '==========' >> /home/$MY_USERNAME/README echo '==========' >> /home/$MY_USERNAME/README
echo "Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README echo $"Your MariaDB gnusocial admin password is: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
@ -7340,7 +7339,7 @@ quit" > $INSTALL_DIR/batch.sql
# backups are not being used # backups are not being used
backup_databases_script_header backup_databases_script_header
echo '' >> /usr/bin/backupdatabases echo '' >> /usr/bin/backupdatabases
echo '# Backup the GNU Social database' >> /usr/bin/backupdatabases echo $'# Backup the GNU Social database' >> /usr/bin/backupdatabases
echo 'TEMPFILE=/root/gnusocial.sql' >> /usr/bin/backupdatabases echo 'TEMPFILE=/root/gnusocial.sql' >> /usr/bin/backupdatabases
echo 'DAILYFILE=/var/backups/gnusocial_daily.sql' >> /usr/bin/backupdatabases echo 'DAILYFILE=/var/backups/gnusocial_daily.sql' >> /usr/bin/backupdatabases
echo 'mysqldump --password="$MYSQL_PASSWORD" gnusocial > $TEMPFILE' >> /usr/bin/backupdatabases echo 'mysqldump --password="$MYSQL_PASSWORD" gnusocial > $TEMPFILE' >> /usr/bin/backupdatabases
@ -7367,7 +7366,7 @@ quit" > $INSTALL_DIR/batch.sql
echo 'fi' >> /usr/bin/backupdatabases echo 'fi' >> /usr/bin/backupdatabases
echo '' >> /etc/cron.weekly/backupdatabasesweekly echo '' >> /etc/cron.weekly/backupdatabasesweekly
echo '# GNU Social' >> /etc/cron.weekly/backupdatabasesweekly echo $'# GNU Social' >> /etc/cron.weekly/backupdatabasesweekly
echo 'if [ -f /var/backups/gnusocial_weekly.sql ]; then' >> /etc/cron.weekly/backupdatabasesweekly echo 'if [ -f /var/backups/gnusocial_weekly.sql ]; then' >> /etc/cron.weekly/backupdatabasesweekly
echo ' cp -f /var/backups/gnusocial_weekly.sql /var/backups/gnusocial_2weekly.sql' >> /etc/cron.weekly/backupdatabasesweekly echo ' cp -f /var/backups/gnusocial_weekly.sql /var/backups/gnusocial_2weekly.sql' >> /etc/cron.weekly/backupdatabasesweekly
echo 'fi' >> /etc/cron.weekly/backupdatabasesweekly echo 'fi' >> /etc/cron.weekly/backupdatabasesweekly
@ -7376,7 +7375,7 @@ quit" > $INSTALL_DIR/batch.sql
echo 'fi' >> /etc/cron.weekly/backupdatabasesweekly echo 'fi' >> /etc/cron.weekly/backupdatabasesweekly
echo '' >> /etc/cron.monthly/backupdatabasesmonthly echo '' >> /etc/cron.monthly/backupdatabasesmonthly
echo '# GNU Social' >> /etc/cron.monthly/backupdatabasesmonthly echo $'# GNU Social' >> /etc/cron.monthly/backupdatabasesmonthly
echo 'if [ -f /var/backups/gnusocial_monthly.sql ]; then' >> /etc/cron.monthly/backupdatabasesmonthly echo 'if [ -f /var/backups/gnusocial_monthly.sql ]; then' >> /etc/cron.monthly/backupdatabasesmonthly
echo ' cp -f /var/backups/gnusocial_monthly.sql /var/backups/gnusocial_2monthly.sql' >> /etc/cron.monthly/backupdatabasesmonthly echo ' cp -f /var/backups/gnusocial_monthly.sql /var/backups/gnusocial_2monthly.sql' >> /etc/cron.monthly/backupdatabasesmonthly
echo 'fi' >> /etc/cron.monthly/backupdatabasesmonthly echo 'fi' >> /etc/cron.monthly/backupdatabasesmonthly
@ -7392,40 +7391,40 @@ quit" > $INSTALL_DIR/batch.sql
service nginx restart service nginx restart
# some post-install instructions for the user # some post-install instructions for the user
if ! grep -q "To set up your microblog" /home/$MY_USERNAME/README; then if ! grep -q $"To set up your microblog go to" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Microblog' >> /home/$MY_USERNAME/README echo $'Microblog' >> /home/$MY_USERNAME/README
echo '=========' >> /home/$MY_USERNAME/README echo '=========' >> /home/$MY_USERNAME/README
echo "To set up your microblog go to" >> /home/$MY_USERNAME/README echo $"To set up your microblog go to" >> /home/$MY_USERNAME/README
echo "https://$MICROBLOG_DOMAIN_NAME/install.php" >> /home/$MY_USERNAME/README echo $"https://$MICROBLOG_DOMAIN_NAME/install.php" >> /home/$MY_USERNAME/README
echo 'and enter the following settings:' >> /home/$MY_USERNAME/README echo $'and enter the following settings:' >> /home/$MY_USERNAME/README
echo ' - Set a name for the site' >> /home/$MY_USERNAME/README echo $' - Set a name for the site' >> /home/$MY_USERNAME/README
echo ' - Server SSL: enable' >> /home/$MY_USERNAME/README echo $' - Server SSL: enable' >> /home/$MY_USERNAME/README
echo ' - Hostname: localhost' >> /home/$MY_USERNAME/README echo $' - Hostname: localhost' >> /home/$MY_USERNAME/README
echo ' - Type: MySql/MariaDB' >> /home/$MY_USERNAME/README echo $' - Type: MySql/MariaDB' >> /home/$MY_USERNAME/README
echo ' - Name: gnusocial' >> /home/$MY_USERNAME/README echo $' - Name: gnusocial' >> /home/$MY_USERNAME/README
echo ' - DB username: root' >> /home/$MY_USERNAME/README echo $' - DB username: root' >> /home/$MY_USERNAME/README
echo " - DB Password; $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README echo $" - DB Password; $MARIADB_PASSWORD" >> /home/$MY_USERNAME/README
echo " - Administrator nickname: $MY_USERNAME" >> /home/$MY_USERNAME/README echo $" - Administrator nickname: $MY_USERNAME" >> /home/$MY_USERNAME/README
echo " - Administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README echo $" - Administrator password: $MICROBLOG_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
echo ' - Subscribe to announcements: ticked' >> /home/$MY_USERNAME/README echo $' - Subscribe to announcements: ticked' >> /home/$MY_USERNAME/README
echo ' - Site profile: Community' >> /home/$MY_USERNAME/README echo $' - Site profile: Community' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'When the install is complete you will see a lot of warnings' >> /home/$MY_USERNAME/README echo $'When the install is complete you will see a lot of warnings' >> /home/$MY_USERNAME/README
echo 'but just ignore those and navigate to ' >> /home/$MY_USERNAME/README echo $'but just ignore those and navigate to ' >> /home/$MY_USERNAME/README
echo "https://$MICROBLOG_DOMAIN_NAME and you can then " >> /home/$MY_USERNAME/README echo $"https://$MICROBLOG_DOMAIN_NAME and you can then " >> /home/$MY_USERNAME/README
echo 'complete the configuration via the *Admin* section on the header' >> /home/$MY_USERNAME/README echo $'complete the configuration via the *Admin* section on the header' >> /home/$MY_USERNAME/README
echo 'bar. Some recommended admin settings are:' >> /home/$MY_USERNAME/README echo $'bar. Some recommended admin settings are:' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Under the *Site* settings:' >> /home/$MY_USERNAME/README echo $'Under the *Site* settings:' >> /home/$MY_USERNAME/README
echo ' Text limit: 140' >> /home/$MY_USERNAME/README echo ' Text limit: 140' >> /home/$MY_USERNAME/README
echo ' Dupe Limit: 60000' >> /home/$MY_USERNAME/README echo ' Dupe Limit: 60000' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Under the *User* settings:' >> /home/$MY_USERNAME/README echo $'Under the *User* settings:' >> /home/$MY_USERNAME/README
echo ' Bio limit: 1000' >> /home/$MY_USERNAME/README echo ' Bio limit: 1000' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Under the *Access* settings:' >> /home/$MY_USERNAME/README echo $'Under the *Access* settings:' >> /home/$MY_USERNAME/README
echo ' /Invite only/ ticked' >> /home/$MY_USERNAME/README echo ' /Invite only/ ticked' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
@ -7510,7 +7509,7 @@ function install_hubzilla {
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'Hubzilla' >> /home/$MY_USERNAME/README echo 'Hubzilla' >> /home/$MY_USERNAME/README
echo '==========' >> /home/$MY_USERNAME/README echo '==========' >> /home/$MY_USERNAME/README
echo "Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README echo $"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
@ -7659,7 +7658,7 @@ quit" > $INSTALL_DIR/batch.sql
# backups are not being used # backups are not being used
backup_databases_script_header backup_databases_script_header
echo '' >> /usr/bin/backupdatabases echo '' >> /usr/bin/backupdatabases
echo '# Backup the Hubzilla database' >> /usr/bin/backupdatabases echo $'# Backup the Hubzilla database' >> /usr/bin/backupdatabases
echo 'TEMPFILE=/root/hubzilla.sql' >> /usr/bin/backupdatabases echo 'TEMPFILE=/root/hubzilla.sql' >> /usr/bin/backupdatabases
echo 'DAILYFILE=/var/backups/hubzilla_daily.sql' >> /usr/bin/backupdatabases echo 'DAILYFILE=/var/backups/hubzilla_daily.sql' >> /usr/bin/backupdatabases
echo 'mysqldump --password="$MYSQL_PASSWORD" hubzilla > $TEMPFILE' >> /usr/bin/backupdatabases echo 'mysqldump --password="$MYSQL_PASSWORD" hubzilla > $TEMPFILE' >> /usr/bin/backupdatabases
@ -7717,20 +7716,20 @@ quit" > $INSTALL_DIR/batch.sql
service cron restart service cron restart
# some post-install instructions for the user # some post-install instructions for the user
if ! grep -q "To set up your Hubzilla" /home/$MY_USERNAME/README; then if ! grep -q $"To set up your Hubzilla site go to" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo "To set up your Hubzilla site go to" >> /home/$MY_USERNAME/README echo $"To set up your Hubzilla site go to" >> /home/$MY_USERNAME/README
echo "https://$HUBZILLA_DOMAIN_NAME" >> /home/$MY_USERNAME/README echo "https://$HUBZILLA_DOMAIN_NAME" >> /home/$MY_USERNAME/README
echo 'You will need to have a non self-signed SSL certificate in order' >> /home/$MY_USERNAME/README echo $'You will need to have a non self-signed SSL certificate in order' >> /home/$MY_USERNAME/README
echo "to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt" >> /home/$MY_USERNAME/README echo $"to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt" >> /home/$MY_USERNAME/README
echo "and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key." >> /home/$MY_USERNAME/README echo $"and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key." >> /home/$MY_USERNAME/README
echo 'If there is an intermediate certificate needed (such as with StartSSL) then' >> /home/$MY_USERNAME/README echo $'If there is an intermediate certificate needed (such as with StartSSL) then' >> /home/$MY_USERNAME/README
echo 'this will need to be concatenated onto the end of the crt file, like this:' >> /home/$MY_USERNAME/README echo $'this will need to be concatenated onto the end of the crt file, like this:' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo " cat /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem > /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README echo " cat /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem > /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo "Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README echo $"Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README
echo "within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME" >> /home/$MY_USERNAME/README echo $"within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME" >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
@ -7789,7 +7788,7 @@ function install_dlna_server {
apt-get -y install minidlna apt-get -y install minidlna
if [ ! -f /etc/minidlna.conf ]; then if [ ! -f /etc/minidlna.conf ]; then
echo "ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE" echo $"ERROR: minidlna does not appear to have installed. $CHECK_MESSAGE"
exit 55 exit 55
fi fi
@ -8496,11 +8495,11 @@ function install_voip {
# Check that the cert was created # Check that the cert was created
if [ ! -f /etc/ssl/certs/mumble.crt ]; then if [ ! -f /etc/ssl/certs/mumble.crt ]; then
echo 'VoIP server certificate not created' echo $'VoIP server certificate not created'
exit 57892 exit 57892
fi fi
if [ ! -f /etc/ssl/private/mumble.key ]; then if [ ! -f /etc/ssl/private/mumble.key ]; then
echo 'VoIP server key not created' echo $'VoIP server key not created'
exit 57893 exit 57893
fi fi
if [ ! -d /var/lib/mumble-server ]; then if [ ! -d /var/lib/mumble-server ]; then
@ -8539,17 +8538,17 @@ function install_voip {
systemctl restart mumble-server systemctl restart mumble-server
if ! grep -q "VoIP Server" /home/$MY_USERNAME/README; then if ! grep -q $"VoIP Server" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'VoIP Server' >> /home/$MY_USERNAME/README echo $'VoIP Server' >> /home/$MY_USERNAME/README
echo '===========' >> /home/$MY_USERNAME/README echo '===========' >> /home/$MY_USERNAME/README
echo 'VoIP server username: mumble-server' >> /home/$MY_USERNAME/README echo $'VoIP server username: mumble-server' >> /home/$MY_USERNAME/README
if [[ $SYSTEM_TYPE != "VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE != "VARIANT_MESH" ]]; then
echo "VoIP server password: $VOIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README echo $"VoIP server password: $VOIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
fi fi
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'To connect to the VoIP server use your username and the server password shown above.' >> /home/$MY_USERNAME/README echo $'To connect to the VoIP server use your username and the server password shown above.' >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
fi fi
@ -8624,14 +8623,14 @@ function install_sip {
service sipwitch start service sipwitch start
if ! grep -q "SIP Server" /home/$MY_USERNAME/README; then if ! grep -q $"SIP Server" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README
echo 'SIP Server' >> /home/$MY_USERNAME/README echo $'SIP Server' >> /home/$MY_USERNAME/README
echo '==========' >> /home/$MY_USERNAME/README echo '==========' >> /home/$MY_USERNAME/README
echo "SIP server username: $MY_USERNAME" >> /home/$MY_USERNAME/README echo $"SIP server username: $MY_USERNAME" >> /home/$MY_USERNAME/README
echo "SIP server extension: 201" >> /home/$MY_USERNAME/README echo $"SIP server extension: 201" >> /home/$MY_USERNAME/README
echo "SIP server password: $SIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README echo $"SIP server password: $SIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
chmod 600 /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README
fi fi