瀏覽代碼

Consolidate onion ports

Bob Mottram 9 年之前
父節點
當前提交
14fc909334
共有 1 個檔案被更改,包括 4 行新增24 行删除
  1. 4
    24
      src/freedombone

+ 4
- 24
src/freedombone 查看文件

86
 CONFIGURATION_FILE="${PROJECT_NAME}.cfg"
86
 CONFIGURATION_FILE="${PROJECT_NAME}.cfg"
87
 
87
 
88
 SSH_PORT=2222
88
 SSH_PORT=2222
89
-SSH_ONION_PORT=8094
90
 IRC_PORT=6697
89
 IRC_PORT=6697
91
-IRC_ONION_PORT=8097
92
 
90
 
93
 # An optional password to log into IRC. This applies to all users
91
 # An optional password to log into IRC. This applies to all users
94
 IRC_PASSWORD=
92
 IRC_PASSWORD=
348
 VOIP_PORT=64738
346
 VOIP_PORT=64738
349
 SIP_SERVER_PASSWORD=
347
 SIP_SERVER_PASSWORD=
350
 SIP_PORT=5060
348
 SIP_PORT=5060
351
-VOIP_ONION_PORT=8095
352
-SIP_ONION_PORT=8096
353
 
349
 
354
 # Location of VoIP database and configuration
350
 # Location of VoIP database and configuration
355
 VOIP_DATABASE="mumble-server.sqlite"
351
 VOIP_DATABASE="mumble-server.sqlite"
3734
         return
3730
         return
3735
     fi
3731
     fi
3736
 
3732
 
3737
-    SSH_ONION_HOSTNAME=$(add_onion_service ssh ${SSH_PORT} ${SSH_ONION_PORT})
3733
+    SSH_ONION_HOSTNAME=$(add_onion_service ssh ${SSH_PORT} ${SSH_PORT})
3738
 
3734
 
3739
     if ! grep -q "ssh onion domain" $COMPLETION_FILE; then
3735
     if ! grep -q "ssh onion domain" $COMPLETION_FILE; then
3740
         echo "ssh onion domain:${SSH_ONION_HOSTNAME}" >> $COMPLETION_FILE
3736
         echo "ssh onion domain:${SSH_ONION_HOSTNAME}" >> $COMPLETION_FILE
7201
     touch /var/run/ngircd/ngircd.pid
7197
     touch /var/run/ngircd/ngircd.pid
7202
     chown -R irc:irc /var/run/ngircd
7198
     chown -R irc:irc /var/run/ngircd
7203
 
7199
 
7204
-    IRC_ONION_HOSTNAME=
7205
-    if [[ $ONION_ONLY != "no" ]]; then
7206
-        sed -i "s/;Ports =.*/Ports = $IRC_PORT/g" /etc/ngircd/ngircd.conf
7207
-        IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_PORT})
7208
-    else
7209
-        IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_ONION_PORT})
7210
-    fi
7200
+    IRC_ONION_HOSTNAME=$(add_onion_service irc ${IRC_PORT} ${IRC_PORT})
7211
     if ! grep -q $"IRC onion domain" $COMPLETION_FILE; then
7201
     if ! grep -q $"IRC onion domain" $COMPLETION_FILE; then
7212
         echo "IRC onion domain:$IRC_ONION_HOSTNAME" >> $COMPLETION_FILE
7202
         echo "IRC onion domain:$IRC_ONION_HOSTNAME" >> $COMPLETION_FILE
7213
     fi
7203
     fi
9538
     sed -i 's|allowhtml=.*|allowhtml=False|g' /etc/mumble-server.ini
9528
     sed -i 's|allowhtml=.*|allowhtml=False|g' /etc/mumble-server.ini
9539
     sed -i "s|port=.*|port=${VOIP_PORT}|g" /etc/mumble-server.ini
9529
     sed -i "s|port=.*|port=${VOIP_PORT}|g" /etc/mumble-server.ini
9540
 
9530
 
9541
-    VOIP_ONION_HOSTNAME=
9542
-    if [[ $ONION_ONLY != "no" ]]; then
9543
-        VOIP_ONION_HOSTNAME=$(add_onion_service voip ${VOIP_PORT} ${VOIP_PORT})
9544
-    else
9545
-        VOIP_ONION_HOSTNAME=$(add_onion_service voip ${VOIP_PORT} ${VOIP_ONION_PORT})
9546
-    fi
9531
+    VOIP_ONION_HOSTNAME=$(add_onion_service voip ${VOIP_PORT} ${VOIP_PORT})
9547
     if ! grep -q $"VoIP onion domain" $COMPLETION_FILE; then
9532
     if ! grep -q $"VoIP onion domain" $COMPLETION_FILE; then
9548
         echo "VoIP onion domain:$VOIP_ONION_HOSTNAME" >> $COMPLETION_FILE
9533
         echo "VoIP onion domain:$VOIP_ONION_HOSTNAME" >> $COMPLETION_FILE
9549
     fi
9534
     fi
9634
     groupadd sipwitch
9619
     groupadd sipwitch
9635
     usermod -aG sipwitch $MY_USERNAME
9620
     usermod -aG sipwitch $MY_USERNAME
9636
 
9621
 
9637
-    SIP_ONION_HOSTNAME=
9638
-    if [[ $ONION_ONLY == "no" ]]; then
9639
-        SIP_ONION_HOSTNAME=$(add_onion_service sip ${SIP_PORT} ${SIP_ONION_PORT})
9640
-    else
9641
-        SIP_ONION_HOSTNAME=$(add_onion_service sip ${SIP_PORT} ${SIP_PORT})
9642
-    fi
9622
+    SIP_ONION_HOSTNAME=$(add_onion_service sip ${SIP_PORT} ${SIP_PORT})
9643
     if ! grep -q $"SIP onion domain" $COMPLETION_FILE; then
9623
     if ! grep -q $"SIP onion domain" $COMPLETION_FILE; then
9644
         echo "SIP onion domain:$SIP_ONION_HOSTNAME" >> $COMPLETION_FILE
9624
         echo "SIP onion domain:$SIP_ONION_HOSTNAME" >> $COMPLETION_FILE
9645
     fi
9625
     fi