From 7e58a547a88c64aa37e58b98a3b6880dd6aafd41 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 24 Feb 2016 16:37:40 +0000 Subject: [PATCH] Update readme for hubzilla --- src/freedombone | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/freedombone b/src/freedombone index f27374c5..e3b376b4 100755 --- a/src/freedombone +++ b/src/freedombone @@ -9041,6 +9041,12 @@ function install_hubzilla { chown -R www-data:www-data $HUBZILLA_PATH fi + HUBZILLA_ONION_HOSTNAME= + if [[ $ONION_ONLY != "no" ]]; then + HUBZILLA_ONION_HOSTNAME=$(add_onion_service hubzilla 80 ${HUBZILLA_ONION_PORT}) + echo "Hubzilla onion domain:${HUBZILLA_ONION_HOSTNAME}" >> $COMPLETION_FILE + fi + get_mariadb_hubzilla_admin_password if [ ! $HUBZILLA_ADMIN_PASSWORD ]; then if [ -f $IMAGE_PASSWORD_FILE ]; then @@ -9051,7 +9057,12 @@ function install_hubzilla { echo '' >> /home/$MY_USERNAME/README echo '' >> /home/$MY_USERNAME/README echo 'Hubzilla' >> /home/$MY_USERNAME/README - echo '==========' >> /home/$MY_USERNAME/README + echo '========' >> /home/$MY_USERNAME/README + if [[ $ONION_ONLY == 'no' ]]; then + echo $"Open https://$HUBZILLA_DOMAIN_NAME and register a new user" >> /home/$MY_USERNAME/README + else + echo $"Open http://$HUBZILLA_ONION_HOSTNAME and register a new user" >> /home/$MY_USERNAME/README + fi echo $"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README @@ -9067,18 +9078,6 @@ function install_hubzilla { CURRENT_DDNS_DOMAIN=$HUBZILLA_DOMAIN_NAME add_ddns_domain - HUBZILLA_ONION_HOSTNAME= - if [[ $ONION_ONLY != "no" ]]; then - HUBZILLA_ONION_HOSTNAME=$(add_onion_service hubzilla 80 ${HUBZILLA_ONION_PORT}) - if ! grep -q "Hubzilla onion domain" /home/$MY_USERNAME/README; then - echo "Hubzilla onion domain: ${HUBZILLA_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README - echo '' >> /home/$MY_USERNAME/README - chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README - chmod 600 /home/$MY_USERNAME/README - fi - echo "Hubzilla onion domain:${HUBZILLA_ONION_HOSTNAME}" >> $COMPLETION_FILE - fi - if [[ $ONION_ONLY == "no" ]]; then nginx_http_redirect $HUBZILLA_DOMAIN_NAME echo 'server {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME