Consolidate onion ports

src/freedombone

@@ -86,9 +86,7 @@ INSTALLING_FROM_CONFIGURATION_FILE="no"
 CONFIGURATION_FILE="${PROJECT_NAME}.cfg"
 
 SSH_PORT=2222
-SSH_ONION_PORT=8094
 IRC_PORT=6697
-IRC_ONION_PORT=8097
 
 # An optional password to log into IRC. This applies to all users
 IRC_PASSWORD=
@@ -348,8 +346,6 @@ VOIP_SERVER_PASSWORD=
 VOIP_PORT=64738
 SIP_SERVER_PASSWORD=
 SIP_PORT=5060
-VOIP_ONION_PORT=8095
-SIP_ONION_PORT=8096
 
 # Location of VoIP database and configuration
 VOIP_DATABASE="mumble-server.sqlite"
@@ -3734,7 +3730,7 @@ function configure_ssh_onion {
         return
     fi
 
-    SSH_ONION_HOSTNAME=$(add_onion_service ssh ${SSH_PORT} ${SSH_ONION_PORT})
+    SSH_ONION_HOSTNAME=$(add_onion_service ssh ${SSH_PORT} ${SSH_PORT})
 
     if ! grep -q "ssh onion domain" $COMPLETION_FILE; then
         echo "ssh onion domain:${SSH_ONION_HOSTNAME}" >> $COMPLETION_FILE
@@ -7201,13 +7197,7 @@ function install_irc_server {
     touch /var/run/ngircd/ngircd.pid
     chown -R irc:irc /var/run/ngircd
 
-    IRC_ONION_HOSTNAME=
-    if [[ $ONION_ONLY != "no" ]]; then
-        sed -i "s/;Ports =.*/Ports = $IRC_PORT/g" /etc/ngircd/ngircd.conf
-        IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_PORT})
-    else
-        IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_ONION_PORT})
-    fi
+    IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_PORT})
     if ! grep -q $"IRC onion domain" $COMPLETION_FILE; then
         echo "IRC onion domain:$IRC_ONION_HOSTNAME" >> $COMPLETION_FILE
     fi
@@ -9538,12 +9528,7 @@ function install_voip {
     sed -i 's|allowhtml=.*|allowhtml=False|g' /etc/mumble-server.ini
     sed -i "s|port=.*|port=${VOIP_PORT}|g" /etc/mumble-server.ini
 
-    VOIP_ONION_HOSTNAME=
-    if [[ $ONION_ONLY != "no" ]]; then
-        VOIP_ONION_HOSTNAME=$(add_onion_service voip ${VOIP_PORT} ${VOIP_PORT})
-    else
-        VOIP_ONION_HOSTNAME=$(add_onion_service voip ${VOIP_PORT} ${VOIP_ONION_PORT})
-    fi
+    VOIP_ONION_HOSTNAME=$(add_onion_service voip ${VOIP_PORT} ${VOIP_PORT})
     if ! grep -q $"VoIP onion domain" $COMPLETION_FILE; then
         echo "VoIP onion domain:$VOIP_ONION_HOSTNAME" >> $COMPLETION_FILE
     fi
@@ -9634,12 +9619,7 @@ function install_sip {
     groupadd sipwitch
     usermod -aG sipwitch $MY_USERNAME
 
-    SIP_ONION_HOSTNAME=
-    if [[ $ONION_ONLY == "no" ]]; then
-        SIP_ONION_HOSTNAME=$(add_onion_service sip ${SIP_PORT} ${SIP_ONION_PORT})
-    else
-        SIP_ONION_HOSTNAME=$(add_onion_service sip ${SIP_PORT} ${SIP_PORT})
-    fi
+    SIP_ONION_HOSTNAME=$(add_onion_service sip ${SIP_PORT} ${SIP_PORT})
     if ! grep -q $"SIP onion domain" $COMPLETION_FILE; then
         echo "SIP onion domain:$SIP_ONION_HOSTNAME" >> $COMPLETION_FILE
     fi