|
@@ -7437,6 +7437,17 @@ function install_watchdog_script {
|
7437
|
7437
|
echo 'install_watchdog_script' >> $COMPLETION_FILE
|
7438
|
7438
|
}
|
7439
|
7439
|
|
|
7440
|
+function install_irc_client {
|
|
7441
|
+ if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
|
7442
|
+ return
|
|
7443
|
+ fi
|
|
7444
|
+ if grep -Fxq "install_irc_client" $COMPLETION_FILE; then
|
|
7445
|
+ return
|
|
7446
|
+ fi
|
|
7447
|
+ apt-get -y install irssi
|
|
7448
|
+ echo 'install_irc_client' >> $COMPLETION_FILE
|
|
7449
|
+}
|
|
7450
|
+
|
7440
|
7451
|
function install_irc_server {
|
7441
|
7452
|
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
7442
|
7453
|
return
|
|
@@ -7446,11 +7457,6 @@ function install_irc_server {
|
7446
|
7457
|
fi
|
7447
|
7458
|
apt-get -y install ngircd
|
7448
|
7459
|
|
7449
|
|
- # for mesh peers also install an irc client
|
7450
|
|
- if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
7451
|
|
- apt-get -y install irssi
|
7452
|
|
- fi
|
7453
|
|
-
|
7454
|
7460
|
if [ ! -d /etc/ngircd ]; then
|
7455
|
7461
|
echo $"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE"
|
7456
|
7462
|
exit 53
|
|
@@ -9058,11 +9064,11 @@ function install_hubzilla {
|
9058
|
9064
|
echo '' >> /home/$MY_USERNAME/README
|
9059
|
9065
|
echo 'Hubzilla' >> /home/$MY_USERNAME/README
|
9060
|
9066
|
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
|
|
9067
|
+ if [[ $ONION_ONLY == 'no' ]]; then
|
|
9068
|
+ echo $"Open https://$HUBZILLA_DOMAIN_NAME and register a new user" >> /home/$MY_USERNAME/README
|
|
9069
|
+ else
|
|
9070
|
+ echo $"Open http://$HUBZILLA_ONION_HOSTNAME and register a new user" >> /home/$MY_USERNAME/README
|
|
9071
|
+ fi
|
9066
|
9072
|
echo $"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
|
9067
|
9073
|
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
|
9068
|
9074
|
chmod 600 /home/$MY_USERNAME/README
|
|
@@ -10317,6 +10323,7 @@ install_tox_node
|
10317
|
10323
|
install_tox_client
|
10318
|
10324
|
tox_avahi
|
10319
|
10325
|
configure_firewall_for_xmpp
|
|
10326
|
+install_irc_client
|
10320
|
10327
|
install_irc_server
|
10321
|
10328
|
configure_firewall_for_irc
|
10322
|
10329
|
install_voip
|