|
@@ -9041,6 +9041,12 @@ function install_hubzilla {
|
9041
|
9041
|
chown -R www-data:www-data $HUBZILLA_PATH
|
9042
|
9042
|
fi
|
9043
|
9043
|
|
|
9044
|
+ HUBZILLA_ONION_HOSTNAME=
|
|
9045
|
+ if [[ $ONION_ONLY != "no" ]]; then
|
|
9046
|
+ HUBZILLA_ONION_HOSTNAME=$(add_onion_service hubzilla 80 ${HUBZILLA_ONION_PORT})
|
|
9047
|
+ echo "Hubzilla onion domain:${HUBZILLA_ONION_HOSTNAME}" >> $COMPLETION_FILE
|
|
9048
|
+ fi
|
|
9049
|
+
|
9044
|
9050
|
get_mariadb_hubzilla_admin_password
|
9045
|
9051
|
if [ ! $HUBZILLA_ADMIN_PASSWORD ]; then
|
9046
|
9052
|
if [ -f $IMAGE_PASSWORD_FILE ]; then
|
|
@@ -9051,7 +9057,12 @@ function install_hubzilla {
|
9051
|
9057
|
echo '' >> /home/$MY_USERNAME/README
|
9052
|
9058
|
echo '' >> /home/$MY_USERNAME/README
|
9053
|
9059
|
echo 'Hubzilla' >> /home/$MY_USERNAME/README
|
9054
|
|
- echo '==========' >> /home/$MY_USERNAME/README
|
|
9060
|
+ echo '========' >> /home/$MY_USERNAME/README
|
|
9061
|
+ if [[ $ONION_ONLY == 'no' ]]; then
|
|
9062
|
+ echo $"Open https://$HUBZILLA_DOMAIN_NAME and register a new user" >> /home/$MY_USERNAME/README
|
|
9063
|
+ else
|
|
9064
|
+ echo $"Open http://$HUBZILLA_ONION_HOSTNAME and register a new user" >> /home/$MY_USERNAME/README
|
|
9065
|
+ fi
|
9055
|
9066
|
echo $"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
|
9056
|
9067
|
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
|
9057
|
9068
|
chmod 600 /home/$MY_USERNAME/README
|
|
@@ -9067,18 +9078,6 @@ function install_hubzilla {
|
9067
|
9078
|
CURRENT_DDNS_DOMAIN=$HUBZILLA_DOMAIN_NAME
|
9068
|
9079
|
add_ddns_domain
|
9069
|
9080
|
|
9070
|
|
- HUBZILLA_ONION_HOSTNAME=
|
9071
|
|
- if [[ $ONION_ONLY != "no" ]]; then
|
9072
|
|
- HUBZILLA_ONION_HOSTNAME=$(add_onion_service hubzilla 80 ${HUBZILLA_ONION_PORT})
|
9073
|
|
- if ! grep -q "Hubzilla onion domain" /home/$MY_USERNAME/README; then
|
9074
|
|
- echo "Hubzilla onion domain: ${HUBZILLA_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
|
9075
|
|
- echo '' >> /home/$MY_USERNAME/README
|
9076
|
|
- chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
|
9077
|
|
- chmod 600 /home/$MY_USERNAME/README
|
9078
|
|
- fi
|
9079
|
|
- echo "Hubzilla onion domain:${HUBZILLA_ONION_HOSTNAME}" >> $COMPLETION_FILE
|
9080
|
|
- fi
|
9081
|
|
-
|
9082
|
9081
|
if [[ $ONION_ONLY == "no" ]]; then
|
9083
|
9082
|
nginx_http_redirect $HUBZILLA_DOMAIN_NAME
|
9084
|
9083
|
echo 'server {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
|