More translation strings
This commit is contained in:
Bob Mottram
parent
92493126a3
commit
e67e250bab
|
|
@ -9,12 +9,23 @@
|
|||
"The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z": "",
|
||||
"The command ${PROJECT_NAME}-config was not found": "",
|
||||
" ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
|
||||
"Encrypted backup to other servers": "",
|
||||
"Freedombone Configuration": "",
|
||||
"\\nDo you wish to configure some remote backup locations?": "",
|
||||
"There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user.": "",
|
||||
"'$SYSTEM_TYPE' is an unrecognised Freedombone variant.": "",
|
||||
"The configuration file $CONFIGURATION_FILE was not found": "",
|
||||
"Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list.": "",
|
||||
"Private certificate for $CHECK_HOSTNAME was not created": "",
|
||||
"Public certificate for $CHECK_HOSTNAME was not created": "",
|
||||
"Diffie–Hellman parameters for $CHECK_HOSTNAME were not created": "",
|
||||
"Mesh Networking (cjdns)": "",
|
||||
"cjdns IPv6 address: $CJDNS_IPV6": "",
|
||||
"cjdns public key: $CJDNS_PUBLIC_KEY": "",
|
||||
"cjdns private key: $CJDNS_PRIVATE_KEY": "",
|
||||
"cjdns password: $CJDNS_PASSWORD": "",
|
||||
"cjdns port: $CJDNS_PORT": "",
|
||||
"Forward port $CJDNS_PORT from your internet router to the Freedombone": "",
|
||||
"Address: $ZERONET_BLOG_ADDRESS": "",
|
||||
"Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
|
||||
"Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
|
||||
|
|
@ -25,11 +36,17 @@
|
|||
"Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
|
||||
"ZeroNet Mail address: $ZERONET_MAIL_ADDRESS": "",
|
||||
"ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
|
||||
"ZeroNet Mail address": "",
|
||||
"ZeroNet Mail address: $ZERONET_MAIL_ADDRESS": "",
|
||||
"${MY_USERNAME}'s Forum": "",
|
||||
"Address: $ZERONET_FORUM_ADDRESS": "",
|
||||
"Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
|
||||
"Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
|
||||
"Forum address: $ZERONET_FORUM_ADDRESS": "",
|
||||
"Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
|
||||
"ZeroNet Forum address": "",
|
||||
"ZeroNet Forum address: $ZERONET_FORUM_ADDRESS": "",
|
||||
"ZeroNet 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.": "",
|
||||
|
|
@ -37,14 +54,29 @@
|
|||
"OneRNG actual hash: $hash": "",
|
||||
"OneRNG Device": "",
|
||||
"Please plug in the OneRNG device": "",
|
||||
"ERROR: Exim does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Unknown subkey usage: $GPG_KEY_USAGE": "",
|
||||
"Public key: $MY_GPG_PUBLIC_KEY": "",
|
||||
"Private key: $MY_GPG_PRIVATE_KEY": "",
|
||||
"GPG public key file $MY_GPG_PUBLIC_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": "",
|
||||
"A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
|
||||
"Change your GPG password": "",
|
||||
"It's very important to add a password to your GPG key so that": "",
|
||||
"if anyone does get access to your email they still won't be able": "",
|
||||
"Publish your GPG public key": "",
|
||||
"If you have imported legacy email which is not encrypted": "",
|
||||
"ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Creating the $PUBLIC_MAILING_LIST mailing list": "",
|
||||
"$PUBLIC_MAILING_LIST mailing list": "",
|
||||
"To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
|
||||
"cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
|
||||
"Email import directory $IMPORT_MAILDIR not found": "",
|
||||
"ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Your MariaDB password is: $MARIADB_PASSWORD": "",
|
||||
"ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Music player in Owncloud": "",
|
||||
" *** Freedombone $SYSTEM_TYPE is now installed ***": "",
|
||||
"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
|
||||
|
|
@ -60,11 +92,15 @@
|
|||
"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": "",
|
||||
"Account to run Tox's DHT bootstrap daemon": "",
|
||||
"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": "",
|
||||
"Your Tox node public key is: $TOX_PUBLIC_KEY": "",
|
||||
"ERROR: prosody does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Your XMPP password is: $XMPP_PASSWORD": "",
|
||||
"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"IRC Server": "",
|
||||
"Wiki password": "",
|
||||
"Wiki username: $MY_USERNAME": "",
|
||||
"Wiki password: $WIKI_ADMIN_PASSWORD": "",
|
||||
|
|
|
|||
|
|
@ -9,12 +9,23 @@
|
|||
"The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z": "",
|
||||
"The command ${PROJECT_NAME}-config was not found": "",
|
||||
" ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
|
||||
"Encrypted backup to other servers": "",
|
||||
"Freedombone Configuration": "",
|
||||
"\\nDo you wish to configure some remote backup locations?": "",
|
||||
"There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user.": "",
|
||||
"'$SYSTEM_TYPE' is an unrecognised Freedombone variant.": "",
|
||||
"The configuration file $CONFIGURATION_FILE was not found": "",
|
||||
"Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list.": "",
|
||||
"Private certificate for $CHECK_HOSTNAME was not created": "",
|
||||
"Public certificate for $CHECK_HOSTNAME was not created": "",
|
||||
"Diffie–Hellman parameters for $CHECK_HOSTNAME were not created": "",
|
||||
"Mesh Networking (cjdns)": "",
|
||||
"cjdns IPv6 address: $CJDNS_IPV6": "",
|
||||
"cjdns public key: $CJDNS_PUBLIC_KEY": "",
|
||||
"cjdns private key: $CJDNS_PRIVATE_KEY": "",
|
||||
"cjdns password: $CJDNS_PASSWORD": "",
|
||||
"cjdns port: $CJDNS_PORT": "",
|
||||
"Forward port $CJDNS_PORT from your internet router to the Freedombone": "",
|
||||
"Address: $ZERONET_BLOG_ADDRESS": "",
|
||||
"Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
|
||||
"Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
|
||||
|
|
@ -25,11 +36,17 @@
|
|||
"Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
|
||||
"ZeroNet Mail address: $ZERONET_MAIL_ADDRESS": "",
|
||||
"ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
|
||||
"ZeroNet Mail address": "",
|
||||
"ZeroNet Mail address: $ZERONET_MAIL_ADDRESS": "",
|
||||
"${MY_USERNAME}'s Forum": "",
|
||||
"Address: $ZERONET_FORUM_ADDRESS": "",
|
||||
"Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
|
||||
"Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
|
||||
"Forum address: $ZERONET_FORUM_ADDRESS": "",
|
||||
"Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
|
||||
"ZeroNet Forum address": "",
|
||||
"ZeroNet Forum address: $ZERONET_FORUM_ADDRESS": "",
|
||||
"ZeroNet 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.": "",
|
||||
|
|
@ -37,14 +54,29 @@
|
|||
"OneRNG actual hash: $hash": "",
|
||||
"OneRNG Device": "",
|
||||
"Please plug in the OneRNG device": "",
|
||||
"ERROR: Exim does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Unknown subkey usage: $GPG_KEY_USAGE": "",
|
||||
"Public key: $MY_GPG_PUBLIC_KEY": "",
|
||||
"Private key: $MY_GPG_PRIVATE_KEY": "",
|
||||
"GPG public key file $MY_GPG_PUBLIC_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": "",
|
||||
"A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
|
||||
"Change your GPG password": "",
|
||||
"It's very important to add a password to your GPG key so that": "",
|
||||
"if anyone does get access to your email they still won't be able": "",
|
||||
"Publish your GPG public key": "",
|
||||
"If you have imported legacy email which is not encrypted": "",
|
||||
"ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Creating the $PUBLIC_MAILING_LIST mailing list": "",
|
||||
"$PUBLIC_MAILING_LIST mailing list": "",
|
||||
"To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
|
||||
"cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
|
||||
"Email import directory $IMPORT_MAILDIR not found": "",
|
||||
"ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Your MariaDB password is: $MARIADB_PASSWORD": "",
|
||||
"ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Music player in Owncloud": "",
|
||||
" *** Freedombone $SYSTEM_TYPE is now installed ***": "",
|
||||
"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
|
||||
|
|
@ -60,11 +92,15 @@
|
|||
"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": "",
|
||||
"Account to run Tox's DHT bootstrap daemon": "",
|
||||
"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": "",
|
||||
"Your Tox node public key is: $TOX_PUBLIC_KEY": "",
|
||||
"ERROR: prosody does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Your XMPP password is: $XMPP_PASSWORD": "",
|
||||
"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"IRC Server": "",
|
||||
"Wiki password": "",
|
||||
"Wiki username: $MY_USERNAME": "",
|
||||
"Wiki password: $WIKI_ADMIN_PASSWORD": "",
|
||||
|
|
|
|||
|
|
@ -9,12 +9,23 @@
|
|||
"The domain $TEST_DOMAIN_NAME has no top level domain. It should be of the type w.x.y.z, x.y.z or y.z": "",
|
||||
"The command ${PROJECT_NAME}-config was not found": "",
|
||||
" ${PROJECT_NAME}-config -u $MY_USERNAME -f $CONFIGURATION_FILE -w $FREEDOMBONE_WEBSITE -b $FREEDOMBONE_BITMESSAGE -m $MINIMUM_PASSWORD_LENGTH --minimal [yes|no]": "",
|
||||
"Encrypted backup to other servers": "",
|
||||
"Freedombone Configuration": "",
|
||||
"\\nDo you wish to configure some remote backup locations?": "",
|
||||
"There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user.": "",
|
||||
"'$SYSTEM_TYPE' is an unrecognised Freedombone variant.": "",
|
||||
"The configuration file $CONFIGURATION_FILE was not found": "",
|
||||
"Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list.": "",
|
||||
"Private certificate for $CHECK_HOSTNAME was not created": "",
|
||||
"Public certificate for $CHECK_HOSTNAME was not created": "",
|
||||
"Diffie–Hellman parameters for $CHECK_HOSTNAME were not created": "",
|
||||
"Mesh Networking (cjdns)": "",
|
||||
"cjdns IPv6 address: $CJDNS_IPV6": "",
|
||||
"cjdns public key: $CJDNS_PUBLIC_KEY": "",
|
||||
"cjdns private key: $CJDNS_PRIVATE_KEY": "",
|
||||
"cjdns password: $CJDNS_PASSWORD": "",
|
||||
"cjdns port: $CJDNS_PORT": "",
|
||||
"Forward port $CJDNS_PORT from your internet router to the Freedombone": "",
|
||||
"Address: $ZERONET_BLOG_ADDRESS": "",
|
||||
"Public key: $ZERONET_BLOG_PRIVATE_KEY": "",
|
||||
"Unable to find site directory: /opt/zeronet/data/$ZERONET_BLOG_ADDRESS": "",
|
||||
|
|
@ -25,11 +36,17 @@
|
|||
"Unable to find site directory: /opt/zeronet/data/$ZERONET_MAIL_ADDRESS": "",
|
||||
"ZeroNet Mail address: $ZERONET_MAIL_ADDRESS": "",
|
||||
"ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY": "",
|
||||
"ZeroNet Mail address": "",
|
||||
"ZeroNet Mail address: $ZERONET_MAIL_ADDRESS": "",
|
||||
"${MY_USERNAME}'s Forum": "",
|
||||
"Address: $ZERONET_FORUM_ADDRESS": "",
|
||||
"Public key: $ZERONET_FORUM_PRIVATE_KEY": "",
|
||||
"Unable to find site directory: /opt/zeronet/data/$ZERONET_FORUM_ADDRESS": "",
|
||||
"Forum address: $ZERONET_FORUM_ADDRESS": "",
|
||||
"Forum private key: $ZERONET_FORUM_PRIVATE_KEY": "",
|
||||
"ZeroNet Forum address": "",
|
||||
"ZeroNet Forum address: $ZERONET_FORUM_ADDRESS": "",
|
||||
"ZeroNet 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.": "",
|
||||
|
|
@ -37,14 +54,29 @@
|
|||
"OneRNG actual hash: $hash": "",
|
||||
"OneRNG Device": "",
|
||||
"Please plug in the OneRNG device": "",
|
||||
"ERROR: Exim does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Unknown subkey usage: $GPG_KEY_USAGE": "",
|
||||
"Public key: $MY_GPG_PUBLIC_KEY": "",
|
||||
"Private key: $MY_GPG_PRIVATE_KEY": "",
|
||||
"GPG public key file $MY_GPG_PUBLIC_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": "",
|
||||
"A GPG key for $MY_EMAIL_ADDRESS could not be created": "",
|
||||
"Change your GPG password": "",
|
||||
"It's very important to add a password to your GPG key so that": "",
|
||||
"if anyone does get access to your email they still won't be able": "",
|
||||
"Publish your GPG public key": "",
|
||||
"If you have imported legacy email which is not encrypted": "",
|
||||
"ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Creating the $PUBLIC_MAILING_LIST mailing list": "",
|
||||
"$PUBLIC_MAILING_LIST mailing list": "",
|
||||
"To subscribe to the $PUBLIC_MAILING_LIST mailing list send a": "",
|
||||
"cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME": "",
|
||||
"Email import directory $IMPORT_MAILDIR not found": "",
|
||||
"ERROR: nginx does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Your MariaDB password is: $MARIADB_PASSWORD": "",
|
||||
"ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Music player in Owncloud": "",
|
||||
" *** Freedombone $SYSTEM_TYPE is now installed ***": "",
|
||||
"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup": "",
|
||||
|
|
@ -60,11 +92,15 @@
|
|||
"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": "",
|
||||
"Account to run Tox's DHT bootstrap daemon": "",
|
||||
"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": "",
|
||||
"Your Tox node public key is: $TOX_PUBLIC_KEY": "",
|
||||
"ERROR: prosody does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"Your XMPP password is: $XMPP_PASSWORD": "",
|
||||
"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE": "",
|
||||
"IRC Server": "",
|
||||
"Wiki password": "",
|
||||
"Wiki username: $MY_USERNAME": "",
|
||||
"Wiki password: $WIKI_ADMIN_PASSWORD": "",
|
||||
|
|
|
|||
205
src/freedombone
205
src/freedombone
|
|
@ -609,10 +609,10 @@ function interactive_configuration {
|
|||
if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
||||
FRIENDS_SERVERS_LIST=/home/$MY_USERNAME/backup.list
|
||||
|
||||
dialog --title "Encrypted backup to other servers" \
|
||||
--backtitle "Freedombone Configuration" \
|
||||
dialog --title $"Encrypted backup to other servers" \
|
||||
--backtitle $"Freedombone Configuration" \
|
||||
--defaultno \
|
||||
--yesno "\nDo you wish to configure some remote backup locations?" 7 60
|
||||
--yesno $"\nDo you wish to configure some remote backup locations?" 7 60
|
||||
sel=$?
|
||||
case $sel in
|
||||
0) interactive_configuration_remote_backups;;
|
||||
|
|
@ -1058,7 +1058,7 @@ function read_configuration {
|
|||
fi
|
||||
if grep -q "DEBIAN_REPO" $CONFIGURATION_FILE; then
|
||||
DEBIAN_REPO=$(grep "DEBIAN_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
||||
CHECK_MESSAGE="Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
|
||||
CHECK_MESSAGE=$"Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
|
||||
fi
|
||||
if grep -q "VOIP_PORT" $CONFIGURATION_FILE; then
|
||||
VOIP_PORT=$(grep "VOIP_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
||||
|
|
@ -1365,10 +1365,7 @@ function install_not_on_BBB {
|
|||
return
|
||||
fi
|
||||
|
||||
echo '# This file describes the network interfaces available on your system' > /etc/network/interfaces
|
||||
echo '# and how to activate them. For more information, see interfaces(5).' >> /etc/network/interfaces
|
||||
echo '' >> /etc/network/interfaces
|
||||
echo '# The loopback network interface' >> /etc/network/interfaces
|
||||
echo '# The loopback network interface' > /etc/network/interfaces
|
||||
echo 'auto lo' >> /etc/network/interfaces
|
||||
echo 'iface lo inet loopback' >> /etc/network/interfaces
|
||||
echo '' >> /etc/network/interfaces
|
||||
|
|
@ -1807,42 +1804,42 @@ function mesh_cjdns {
|
|||
ip6tables -A INPUT -p tcp --dport $CJDNS_PORT -j ACCEPT
|
||||
save_firewall_settings
|
||||
|
||||
if ! grep -q "Mesh Networking (cjdns)" /home/$MY_USERNAME/README; then
|
||||
if ! grep -q $"Mesh Networking (cjdns)" /home/$MY_USERNAME/README; then
|
||||
CURRENT_IP_ADDRESS=$(ip addr show | grep "inet " | sed -n 2p | awk -F ' ' '{print $2}' | awk -F '/' '{print $1}')
|
||||
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'Mesh Networking (cjdns)' >> /home/$MY_USERNAME/README
|
||||
echo $'Mesh Networking (cjdns)' >> /home/$MY_USERNAME/README
|
||||
echo '=======================' >> /home/$MY_USERNAME/README
|
||||
echo "cjdns IPv6 address: $CJDNS_IPV6" >> /home/$MY_USERNAME/README
|
||||
echo "cjdns public key: $CJDNS_PUBLIC_KEY" >> /home/$MY_USERNAME/README
|
||||
echo "cjdns private key: $CJDNS_PRIVATE_KEY" >> /home/$MY_USERNAME/README
|
||||
echo "cjdns password: $CJDNS_PASSWORD" >> /home/$MY_USERNAME/README
|
||||
echo "cjdns port: $CJDNS_PORT" >> /home/$MY_USERNAME/README
|
||||
echo $"cjdns IPv6 address: $CJDNS_IPV6" >> /home/$MY_USERNAME/README
|
||||
echo $"cjdns public key: $CJDNS_PUBLIC_KEY" >> /home/$MY_USERNAME/README
|
||||
echo $"cjdns private key: $CJDNS_PRIVATE_KEY" >> /home/$MY_USERNAME/README
|
||||
echo $"cjdns password: $CJDNS_PASSWORD" >> /home/$MY_USERNAME/README
|
||||
echo $"cjdns port: $CJDNS_PORT" >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo "Forward port $CJDNS_PORT from your internet router to the Freedombone" >> /home/$MY_USERNAME/README
|
||||
echo $"Forward port $CJDNS_PORT from your internet router to the Freedombone" >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'Below is an example of your connection credentials' >> /home/$MY_USERNAME/README
|
||||
echo 'that you can give to other people so they can connect' >> /home/$MY_USERNAME/README
|
||||
echo 'to you using your default password' >> /home/$MY_USERNAME/README
|
||||
echo 'Adding a unique password for each user is advisable' >> /home/$MY_USERNAME/README
|
||||
echo 'so that leaks can be isolated.' >> /home/$MY_USERNAME/README
|
||||
echo $'Below is an example of your connection credentials' >> /home/$MY_USERNAME/README
|
||||
echo $'that you can give to other people so they can connect' >> /home/$MY_USERNAME/README
|
||||
echo $'to you using your default password' >> /home/$MY_USERNAME/README
|
||||
echo $'Adding a unique password for each user is advisable' >> /home/$MY_USERNAME/README
|
||||
echo $'so that leaks can be isolated.' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo "\"$CURRENT_IP_ADDRESS:$CJDNS_PORT\":{\"password\":\"$CJDNS_PASSWORD\",\"publicKey\":\"$CJDNS_PUBLIC_KEY\"}" >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'More is not better. 3-5 cjdns peers is good. 30 peers is bad.' >> /home/$MY_USERNAME/README
|
||||
echo $'More is not better. 3-5 cjdns peers is good. 30 peers is bad.' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'NEVER USE A PUBLIC PEER. These degrade the network and make it centralized.' >> /home/$MY_USERNAME/README
|
||||
echo 'Each node can handle many peers, but no node can handle the entire internet.' >> /home/$MY_USERNAME/README
|
||||
echo 'As this network grows any public peer will simply become saturated and' >> /home/$MY_USERNAME/README
|
||||
echo 'useless causing issues for the entire network.' >> /home/$MY_USERNAME/README
|
||||
echo 'Please report anyone offering you a public peer as they are promoting shared' >> /home/$MY_USERNAME/README
|
||||
echo 'passwords which could lead to people pretending to be you. A peering pass' >> /home/$MY_USERNAME/README
|
||||
echo 'should not contain someone elses nickname or info but should contain yours' >> /home/$MY_USERNAME/README
|
||||
echo 'to ensure it is not shared. It also helps when editing the conf to know who' >> /home/$MY_USERNAME/README
|
||||
echo 'each password is for.' >> /home/$MY_USERNAME/README
|
||||
echo $'NEVER USE A PUBLIC PEER. These degrade the network and make it centralized.' >> /home/$MY_USERNAME/README
|
||||
echo $'Each node can handle many peers, but no node can handle the entire internet.' >> /home/$MY_USERNAME/README
|
||||
echo $'As this network grows any public peer will simply become saturated and' >> /home/$MY_USERNAME/README
|
||||
echo $'useless causing issues for the entire network.' >> /home/$MY_USERNAME/README
|
||||
echo $'Please report anyone offering you a public peer as they are promoting shared' >> /home/$MY_USERNAME/README
|
||||
echo $'passwords which could lead to people pretending to be you. A peering pass' >> /home/$MY_USERNAME/README
|
||||
echo $'should not contain someone elses nickname or info but should contain yours' >> /home/$MY_USERNAME/README
|
||||
echo $'to ensure it is not shared. It also helps when editing the conf to know who' >> /home/$MY_USERNAME/README
|
||||
echo $'each password is for.' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'Possible cjdns destinations of interest:' >> /home/$MY_USERNAME/README
|
||||
echo $'Possible cjdns destinations of interest:' >> /home/$MY_USERNAME/README
|
||||
echo ' http://transitiontech.ca/faq' >> /home/$MY_USERNAME/README
|
||||
echo ' http://cjdns.ca/hypeirc.txt' >> /home/$MY_USERNAME/README
|
||||
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
|
||||
|
|
@ -1878,7 +1875,7 @@ function mesh_cjdns_tools {
|
|||
export PATH=$PATH:$HOME/projects/go/bin
|
||||
go get github.com/inhies/cjdcmd
|
||||
if [ ! -f $HOME/projects/go/bin/cjdcmd ]; then
|
||||
echo 'cjdcmd was not compiled. Check your golang installation'
|
||||
echo $'cjdcmd was not compiled. Check your golang installation'
|
||||
exit 7439
|
||||
fi
|
||||
cp $HOME/projects/go/bin/cjdcmd /usr/bin
|
||||
|
|
@ -2058,7 +2055,7 @@ function install_zeronet_mail {
|
|||
cd /opt/zeronet
|
||||
python zeronet.py --batch siteCreate 2> /opt/zeronet/mail.txt
|
||||
if [ ! -f /opt/zeronet/mail.txt ]; then
|
||||
echo 'Unable to create mail'
|
||||
echo $'Unable to create mail'
|
||||
exit 479
|
||||
fi
|
||||
mail_address=$(cat mail.txt | grep "Site address" | awk -F ':' '{print $2}')
|
||||
|
|
@ -2087,7 +2084,7 @@ function install_zeronet_mail {
|
|||
|
||||
git clone $ZERONET_MAIL_REPO ZeroMail
|
||||
if [ ! -d /opt/zeronet/ZeroMail ]; then
|
||||
echo 'ZeroMail repo could not be cloned'
|
||||
echo $'ZeroMail repo could not be cloned'
|
||||
exit 6739
|
||||
fi
|
||||
cd /opt/zeronet/ZeroMail
|
||||
|
|
@ -2132,10 +2129,10 @@ function install_zeronet_mail {
|
|||
fi
|
||||
echo "$ZERONET_URL/$ZERONET_MAIL_ADDRESS" > /home/$MY_USERNAME/.config/zeronet/mymail
|
||||
|
||||
if ! grep -q "ZeroNet Mail address" /home/$MY_USERNAME/README; then
|
||||
if ! grep -q $"ZeroNet Mail address" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo "ZeroNet Mail address: $ZERONET_MAIL_ADDRESS" >> /home/$MY_USERNAME/README
|
||||
echo "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY" >> /home/$MY_USERNAME/README
|
||||
echo $"ZeroNet Mail address: $ZERONET_MAIL_ADDRESS" >> /home/$MY_USERNAME/README
|
||||
echo $"ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY" >> /home/$MY_USERNAME/README
|
||||
fi
|
||||
|
||||
echo 'install_zeronet_mail' >> $COMPLETION_FILE
|
||||
|
|
@ -2176,16 +2173,16 @@ function install_zeronet_forum {
|
|||
fi
|
||||
|
||||
if [ ! -d /etc/avahi ]; then
|
||||
echo 'Avahi is not installed'
|
||||
echo $'Avahi is not installed'
|
||||
exit 736
|
||||
fi
|
||||
|
||||
ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum"
|
||||
ZERONET_DEFAULT_FORUM_TITLE=$"${MY_USERNAME}'s Forum"
|
||||
|
||||
cd /opt/zeronet
|
||||
python zeronet.py --batch siteCreate 2> /opt/zeronet/forum.txt
|
||||
if [ ! -f /opt/zeronet/forum.txt ]; then
|
||||
echo 'Unable to create forum'
|
||||
echo $'Unable to create forum'
|
||||
exit 479
|
||||
fi
|
||||
forum_address=$(cat forum.txt | grep "Site address" | awk -F ':' '{print $2}')
|
||||
|
|
@ -2253,10 +2250,10 @@ function install_zeronet_forum {
|
|||
fi
|
||||
echo "$ZERONET_URL/$ZERONET_FORUM_ADDRESS" > /home/$MY_USERNAME/.config/zeronet/myforum
|
||||
|
||||
if ! grep -q "ZeroNet Forum address" /home/$MY_USERNAME/README; then
|
||||
if ! grep -q $"ZeroNet Forum address" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo "ZeroNet Forum address: $ZERONET_FORUM_ADDRESS" >> /home/$MY_USERNAME/README
|
||||
echo "ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY" >> /home/$MY_USERNAME/README
|
||||
echo $"ZeroNet Forum address: $ZERONET_FORUM_ADDRESS" >> /home/$MY_USERNAME/README
|
||||
echo $"ZeroNet Forum private key: $ZERONET_FORUM_PRIVATE_KEY" >> /home/$MY_USERNAME/README
|
||||
fi
|
||||
|
||||
echo 'install_zeronet_forum' >> $COMPLETION_FILE
|
||||
|
|
@ -3046,38 +3043,38 @@ function search_for_attached_usb_drive {
|
|||
fi
|
||||
if [ -b $USB_DRIVE ]; then
|
||||
if [ ! -d $USB_MOUNT ]; then
|
||||
echo 'Mounting USB drive'
|
||||
echo $'Mounting USB drive'
|
||||
mkdir $USB_MOUNT
|
||||
mount $USB_DRIVE $USB_MOUNT
|
||||
fi
|
||||
if ! [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" || $SYSTEM_TYPE == "$VARIANT_NONMAILBOX" ]]; then
|
||||
if [ -d $USB_MOUNT/Maildir ]; then
|
||||
echo 'Maildir found on USB drive'
|
||||
echo $'Maildir found on USB drive'
|
||||
IMPORT_MAILDIR=$USB_MOUNT/Maildir
|
||||
fi
|
||||
if [ -d $USB_MOUNT/.gnupg ]; then
|
||||
echo 'Importing GPG keyring'
|
||||
echo $'Importing GPG keyring'
|
||||
cp -r $USB_MOUNT/.gnupg /home/$MY_USERNAME
|
||||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
|
||||
GPG_KEYS_IMPORTED="yes"
|
||||
if [ ! -f /home/$MY_USERNAME/.gnupg/secring.gpg ]; then
|
||||
echo 'GPG files did not copy'
|
||||
echo $'GPG files did not copy'
|
||||
exit 73529
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -f $USB_MOUNT/.procmailrc ]; then
|
||||
echo 'Importing procmail settings'
|
||||
echo $'Importing procmail settings'
|
||||
cp $USB_MOUNT/.procmailrc /home/$MY_USERNAME
|
||||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.procmailrc
|
||||
fi
|
||||
|
||||
if [ -f $USB_MOUNT/private_key.gpg ]; then
|
||||
echo 'GPG private key found on USB drive'
|
||||
echo $'GPG private key found on USB drive'
|
||||
MY_GPG_PRIVATE_KEY=$USB_MOUNT/private_key.gpg
|
||||
fi
|
||||
if [ -f $USB_MOUNT/public_key.gpg ]; then
|
||||
echo 'GPG public key found on USB drive'
|
||||
echo $'GPG public key found on USB drive'
|
||||
MY_GPG_PUBLIC_KEY=$USB_MOUNT/public_key.gpg
|
||||
fi
|
||||
fi
|
||||
|
|
@ -3089,27 +3086,27 @@ function search_for_attached_usb_drive {
|
|||
chown -R prosody:prosody $XMPP_DIRECTORY
|
||||
fi
|
||||
if [ -d $USB_MOUNT/.ssh ]; then
|
||||
echo 'Importing ssh keys'
|
||||
echo $'Importing ssh keys'
|
||||
cp -r $USB_MOUNT/.ssh /home/$MY_USERNAME
|
||||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
|
||||
# for security delete the ssh keys from the usb drive
|
||||
if [ ! -f /home/$MY_USERNAME/.ssh/id_rsa ]; then
|
||||
echo 'ssh files did not copy'
|
||||
echo $'ssh files did not copy'
|
||||
exit 8
|
||||
fi
|
||||
fi
|
||||
if [ -f $USB_MOUNT/.emacs ]; then
|
||||
echo 'Importing .emacs file'
|
||||
echo $'Importing .emacs file'
|
||||
cp -f $USB_MOUNT/.emacs /home/$MY_USERNAME/.emacs
|
||||
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.emacs
|
||||
fi
|
||||
if [ -d $USB_MOUNT/.emacs.d ]; then
|
||||
echo 'Importing .emacs.d directory'
|
||||
echo $'Importing .emacs.d directory'
|
||||
cp -r $USB_MOUNT/.emacs.d /home/$MY_USERNAME
|
||||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.emacs.d
|
||||
fi
|
||||
if [ -d $USB_MOUNT/ssl ]; then
|
||||
echo 'Importing SSL certificates'
|
||||
echo $'Importing SSL certificates'
|
||||
cp -r $USB_MOUNT/ssl/* /etc/ssl
|
||||
chmod 640 /etc/ssl/certs/*
|
||||
chmod 400 /etc/ssl/private/*
|
||||
|
|
@ -3127,7 +3124,7 @@ function search_for_attached_usb_drive {
|
|||
fi
|
||||
fi
|
||||
if [ -d $USB_MOUNT/personal ]; then
|
||||
echo 'Importing personal directory'
|
||||
echo $'Importing personal directory'
|
||||
cp -r $USB_MOUNT/personal /home/$MY_USERNAME
|
||||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/personal
|
||||
fi
|
||||
|
|
@ -3136,7 +3133,7 @@ function search_for_attached_usb_drive {
|
|||
umount $USB_MOUNT
|
||||
rm -rf $USB_MOUNT
|
||||
fi
|
||||
echo 'No USB drive attached'
|
||||
echo $'No USB drive attached'
|
||||
fi
|
||||
echo 'search_for_attached_usb_drive' >> $COMPLETION_FILE
|
||||
}
|
||||
|
|
@ -3910,7 +3907,7 @@ function configure_email {
|
|||
apt-get -y install exim4 sasl2-bin swaks libnet-ssleay-perl procmail
|
||||
|
||||
if [ ! -d /etc/exim4 ]; then
|
||||
echo "ERROR: Exim does not appear to have installed. $CHECK_MESSAGE"
|
||||
echo $"ERROR: Exim does not appear to have installed. $CHECK_MESSAGE"
|
||||
exit 48
|
||||
fi
|
||||
|
||||
|
|
@ -4210,7 +4207,7 @@ function configure_imap {
|
|||
apt-get -y install dovecot-imapd
|
||||
|
||||
if [ ! -d /etc/dovecot ]; then
|
||||
echo "ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE"
|
||||
echo $"ERROR: Dovecot does not appear to have installed. $CHECK_MESSAGE"
|
||||
exit 48
|
||||
fi
|
||||
|
||||
|
|
@ -4222,7 +4219,7 @@ function configure_imap {
|
|||
chown root:dovecot /etc/ssl/private/dovecot.*
|
||||
|
||||
if [ ! -f /etc/dovecot/conf.d/10-ssl.conf ]; then
|
||||
echo 'Unable to find /etc/dovecot/conf.d/10-ssl.conf'
|
||||
echo $'Unable to find /etc/dovecot/conf.d/10-ssl.conf'
|
||||
exit 83629
|
||||
fi
|
||||
sed -i 's|#ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
|
||||
|
|
@ -4239,7 +4236,7 @@ function configure_imap {
|
|||
echo "ssl_cipher_list = '$SSL_CIPHERS'" >> /etc/dovecot/conf.d/10-ssl.conf
|
||||
|
||||
if [ ! -f /etc/dovecot/conf.d/10-master.conf ]; then
|
||||
echo 'Unable to find /etc/dovecot/conf.d/10-master.conf'
|
||||
echo $'Unable to find /etc/dovecot/conf.d/10-master.conf'
|
||||
exit 49259
|
||||
fi
|
||||
sed -i 's/#process_limit =.*/process_limit = 100/g' /etc/dovecot/conf.d/10-master.conf
|
||||
|
|
@ -4247,26 +4244,26 @@ function configure_imap {
|
|||
sed -i 's|#default_process_limit =.*|default_process_limit = 100|g' /etc/dovecot/conf.d/10-master.conf
|
||||
|
||||
if [ ! -f /etc/dovecot/conf.d/10-logging.conf ]; then
|
||||
echo 'Unable to find /etc/dovecot/conf.d/10-logging.conf'
|
||||
echo $'Unable to find /etc/dovecot/conf.d/10-logging.conf'
|
||||
exit 48936
|
||||
fi
|
||||
sed -i 's/#auth_verbose.*/auth_verbose = yes/g' /etc/dovecot/conf.d/10-logging.conf
|
||||
|
||||
if [ ! -f /etc/dovecot/dovecot.conf ]; then
|
||||
echo 'Unable to find /etc/dovecot/dovecot.conf'
|
||||
echo $'Unable to find /etc/dovecot/dovecot.conf'
|
||||
exit 43890
|
||||
fi
|
||||
sed -i 's/#listen =.*/listen = */g' /etc/dovecot/dovecot.conf
|
||||
|
||||
if [ ! -f /etc/dovecot/conf.d/10-auth.conf ]; then
|
||||
echo 'Unable to find /etc/dovecot/conf.d/10-auth.conf'
|
||||
echo $'Unable to find /etc/dovecot/conf.d/10-auth.conf'
|
||||
exit 843256
|
||||
fi
|
||||
sed -i 's/#disable_plaintext_auth =.*/disable_plaintext_auth = no/g' /etc/dovecot/conf.d/10-auth.conf
|
||||
sed -i 's/auth_mechanisms =.*/auth_mechanisms = plain login/g' /etc/dovecot/conf.d/10-auth.conf
|
||||
|
||||
if [ ! -f /etc/dovecot/conf.d/10-mail.conf ]; then
|
||||
echo 'Unable to find /etc/dovecot/conf.d/10-mail.conf'
|
||||
echo $'Unable to find /etc/dovecot/conf.d/10-mail.conf'
|
||||
exit 42036
|
||||
fi
|
||||
sed -i 's|mail_location =.*|mail_location = maildir:~/Maildir:LAYOUT=fs|g' /etc/dovecot/conf.d/10-mail.conf
|
||||
|
|
@ -4374,8 +4371,8 @@ function create_gpg_subkey {
|
|||
|
||||
GPG_KEY_USAGE=$1
|
||||
if [[ $GPG_KEY_USAGE != "sign" && $GPG_KEY_USAGE != "auth" && $GPG_KEY_USAGE != "encrypt" ]]; then
|
||||
echo "Unknown subkey usage: $GPG_KEY_USAGE"
|
||||
echo 'Available types: sign|auth|encrypt'
|
||||
echo $"Unknown subkey usage: $GPG_KEY_USAGE"
|
||||
echo $'Available types: sign|auth|encrypt'
|
||||
exit 14783
|
||||
fi
|
||||
|
||||
|
|
@ -4531,28 +4528,28 @@ function configure_gpg {
|
|||
su -c "gpg --output $MY_GPG_PUBLIC_KEY --armor --export $MY_GPG_PUBLIC_KEY_ID" - $MY_USERNAME
|
||||
|
||||
if grep -q "configure_email" $COMPLETION_FILE; then
|
||||
if ! grep -q "Change your GPG password" /home/$MY_USERNAME/README; then
|
||||
if ! grep -q $"Change your GPG password" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'Change your GPG password' >> /home/$MY_USERNAME/README
|
||||
echo $'Change your GPG password' >> /home/$MY_USERNAME/README
|
||||
echo '========================' >> /home/$MY_USERNAME/README
|
||||
echo "It's very important to add a password to your GPG key so that" >> /home/$MY_USERNAME/README
|
||||
echo "if anyone does get access to your email they still won't be able" >> /home/$MY_USERNAME/README
|
||||
echo 'to read them without knowning the GPG password.' >> /home/$MY_USERNAME/README
|
||||
echo 'You can change the it with:' >> /home/$MY_USERNAME/README
|
||||
echo $"It's very important to add a password to your GPG key so that" >> /home/$MY_USERNAME/README
|
||||
echo $"if anyone does get access to your email they still won't be able" >> /home/$MY_USERNAME/README
|
||||
echo $'to read them without knowning the GPG password.' >> /home/$MY_USERNAME/README
|
||||
echo $'You can change the it with:' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo " gpg --edit-key $MY_GPG_PUBLIC_KEY_ID" >> /home/$MY_USERNAME/README
|
||||
echo ' passwd' >> /home/$MY_USERNAME/README
|
||||
echo ' save' >> /home/$MY_USERNAME/README
|
||||
echo ' quit' >> /home/$MY_USERNAME/README
|
||||
fi
|
||||
if ! grep -q "Publish your GPG public key" /home/$MY_USERNAME/README; then
|
||||
if ! grep -q $"Publish your GPG public key" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'Publish your GPG public key' >> /home/$MY_USERNAME/README
|
||||
echo $'Publish your GPG public key' >> /home/$MY_USERNAME/README
|
||||
echo '===========================' >> /home/$MY_USERNAME/README
|
||||
echo 'So that others can send emails to you securely you should' >> /home/$MY_USERNAME/README
|
||||
echo 'publish your GPG public key with the command:' >> /home/$MY_USERNAME/README
|
||||
echo $'So that others can send emails to you securely you should' >> /home/$MY_USERNAME/README
|
||||
echo $'publish your GPG public key with the command:' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo " gpg --send-keys $MY_GPG_PUBLIC_KEY_ID" >> /home/$MY_USERNAME/README
|
||||
fi
|
||||
|
|
@ -4587,13 +4584,13 @@ function configure_backup_key {
|
|||
echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf
|
||||
echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
|
||||
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
|
||||
echo 'Backup key does not exist. Creating it.'
|
||||
echo $'Backup key does not exist. Creating it.'
|
||||
su -c "gpg --batch --gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
|
||||
shred -zu /home/$MY_USERNAME/gpg-genkey.conf
|
||||
echo 'Checking that the Backup key was created'
|
||||
echo $'Checking that the Backup key was created'
|
||||
BACKUP_KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_NAME (backup key)")
|
||||
if [[ $BACKUP_KEY_EXISTS == "no" ]]; then
|
||||
echo 'Backup key could not be created'
|
||||
echo $'Backup key could not be created'
|
||||
exit 43382
|
||||
fi
|
||||
fi
|
||||
|
|
@ -4785,7 +4782,7 @@ function email_client {
|
|||
apt-get -y install mutt-patched lynx abook
|
||||
|
||||
if [ ! -f /etc/Muttrc ]; then
|
||||
echo "ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE"
|
||||
echo $"ERROR: Mutt does not appear to have installed. $CHECK_MESSAGE"
|
||||
exit 49
|
||||
fi
|
||||
|
||||
|
|
@ -5024,7 +5021,7 @@ function create_public_mailing_list {
|
|||
adduser $PUBLIC_MAILING_LIST_USER $PUBLIC_MAILING_LIST_USER
|
||||
|
||||
echo ''
|
||||
echo "Creating the $PUBLIC_MAILING_LIST mailing list"
|
||||
echo $"Creating the $PUBLIC_MAILING_LIST mailing list"
|
||||
echo ''
|
||||
|
||||
# create the list
|
||||
|
|
@ -5083,13 +5080,13 @@ function create_public_mailing_list {
|
|||
update-exim4.conf
|
||||
service exim4 restart
|
||||
|
||||
if ! grep -q "$PUBLIC_MAILING_LIST mailing list" /home/$MY_USERNAME/README; then
|
||||
if ! grep -q $"$PUBLIC_MAILING_LIST mailing list" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'Public mailing list' >> /home/$MY_USERNAME/README
|
||||
echo '===================' >> /home/$MY_USERNAME/README
|
||||
echo "To subscribe to the $PUBLIC_MAILING_LIST mailing list send a" >> /home/$MY_USERNAME/README
|
||||
echo "cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
|
||||
echo $"$PUBLIC_MAILING_LIST mailing list" >> /home/$MY_USERNAME/README
|
||||
echo '=================================' >> /home/$MY_USERNAME/README
|
||||
echo $"To subscribe to the $PUBLIC_MAILING_LIST mailing list send a" >> /home/$MY_USERNAME/README
|
||||
echo $"cleartext email to $PUBLIC_MAILING_LIST+subscribe@$DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
|
||||
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
|
||||
chmod 600 /home/$MY_USERNAME/README
|
||||
fi
|
||||
|
|
@ -5200,11 +5197,11 @@ function import_email {
|
|||
fi
|
||||
if [ $IMPORT_MAILDIR ]; then
|
||||
if [ -d $IMPORT_MAILDIR ]; then
|
||||
echo 'Transfering email files'
|
||||
echo $'Transfering email files'
|
||||
cp -r $IMPORT_MAILDIR /home/$MY_USERNAME
|
||||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Maildir
|
||||
else
|
||||
echo "Email import directory $IMPORT_MAILDIR not found"
|
||||
echo $"Email import directory $IMPORT_MAILDIR not found"
|
||||
exit 9
|
||||
fi
|
||||
fi
|
||||
|
|
@ -5274,7 +5271,7 @@ function install_web_server {
|
|||
fi
|
||||
|
||||
if [ ! -d /etc/nginx ]; then
|
||||
echo "ERROR: nginx does not appear to have installed. $CHECK_MESSAGE"
|
||||
echo $"ERROR: nginx does not appear to have installed. $CHECK_MESSAGE"
|
||||
exit 51
|
||||
fi
|
||||
|
||||
|
|
@ -5417,11 +5414,11 @@ function install_mariadb {
|
|||
apt-get -y remove --purge apache*
|
||||
if [ -d /etc/apache2 ]; then
|
||||
rm -rf /etc/apache2
|
||||
echo 'Removed Apache installation after MariaDB install'
|
||||
echo $'Removed Apache installation after MariaDB install'
|
||||
fi
|
||||
|
||||
if [ ! -d /etc/mysql ]; then
|
||||
echo "ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE"
|
||||
echo $"ERROR: mariadb-server does not appear to have installed. $CHECK_MESSAGE"
|
||||
exit 54
|
||||
fi
|
||||
|
||||
|
|
@ -5551,11 +5548,11 @@ function install_owncloud_music_app {
|
|||
|
||||
function add_ddns_domain {
|
||||
if [ ! $CURRENT_DDNS_DOMAIN ]; then
|
||||
echo 'ddns domain not specified'
|
||||
echo $'ddns domain not specified'
|
||||
exit 5638
|
||||
fi
|
||||
if [ ! -f /etc/inadyn.conf ]; then
|
||||
echo 'Unable to find inadyn configuration file /etc/inadyn.conf'
|
||||
echo $'Unable to find inadyn configuration file /etc/inadyn.conf'
|
||||
exit 5745
|
||||
fi
|
||||
if ! grep -q "$DDNS_PROVIDER" /etc/inadyn.conf; then
|
||||
|
|
@ -6098,7 +6095,7 @@ function tox_avahi {
|
|||
fi
|
||||
|
||||
if [ ! -d /etc/avahi ]; then
|
||||
echo 'tox_avahi: avahi is not installed'
|
||||
echo $'tox_avahi: avahi is not installed'
|
||||
exit 87359
|
||||
fi
|
||||
|
||||
|
|
@ -6192,7 +6189,7 @@ function install_tox_node {
|
|||
exit 73862
|
||||
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
|
||||
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"
|
||||
|
|
@ -6271,7 +6268,7 @@ function install_tox_node {
|
|||
|
||||
configure_firewall_for_tox
|
||||
|
||||
if ! grep -q "Tox node" /home/$MY_USERNAME/README; then
|
||||
if ! grep -q $"Your Tox node public key is" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'Tox' >> /home/$MY_USERNAME/README
|
||||
|
|
@ -6350,7 +6347,7 @@ function install_xmpp {
|
|||
apt-get -y install prosody
|
||||
|
||||
if [ ! -d /etc/prosody ]; then
|
||||
echo "ERROR: prosody does not appear to have installed. $CHECK_MESSAGE"
|
||||
echo $"ERROR: prosody does not appear to have installed. $CHECK_MESSAGE"
|
||||
exit 52
|
||||
fi
|
||||
|
||||
|
|
@ -6440,7 +6437,7 @@ function install_xmpp {
|
|||
prosodyctl register $MY_USERNAME $DEFAULT_DOMAIN_NAME $XMPP_PASSWORD
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'XMPP' >> /home/$MY_USERNAME/README
|
||||
echo $'XMPP' >> /home/$MY_USERNAME/README
|
||||
echo '====' >> /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
|
||||
|
|
@ -6553,12 +6550,12 @@ function install_irc_server {
|
|||
echo ' echo " IRC daemon restarted" >> $LOGFILE' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
|
||||
echo 'fi' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
|
||||
|
||||
if ! grep -q "IRC Server" /home/$MY_USERNAME/README; then
|
||||
if ! grep -q $"IRC Server" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo 'IRC Server' >> /home/$MY_USERNAME/README
|
||||
echo $'IRC Server' >> /home/$MY_USERNAME/README
|
||||
echo '==========' >> /home/$MY_USERNAME/README
|
||||
echo 'To connect to your IRC server in irssi:' >> /home/$MY_USERNAME/README
|
||||
echo $'To connect to your IRC server in irssi:' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo " /server add -auto -ssl $DEFAULTDOMAIN $IRC_PORT" >> /home/$MY_USERNAME/README
|
||||
echo " /connect $DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
|
||||
|
|
@ -6592,7 +6589,7 @@ function install_wiki {
|
|||
apt-get -y remove --purge apache*
|
||||
if [ -d /etc/apache2 ]; then
|
||||
rm -rf /etc/apache2
|
||||
echo 'Removed Apache installation after Dokuwiki install'
|
||||
echo $'Removed Apache installation after Dokuwiki install'
|
||||
fi
|
||||
|
||||
if [ ! -d /var/www/$WIKI_DOMAIN_NAME ]; then
|
||||
|
|
|
|||
Loading…
Reference in New Issue