|
@@ -381,6 +381,7 @@ VOIP_SERVER_PASSWORD=
|
381
|
381
|
VOIP_PORT=64738
|
382
|
382
|
SIP_SERVER_PASSWORD=
|
383
|
383
|
SIP_PORT=5060
|
|
384
|
+SIP_TLS_PORT=5061
|
384
|
385
|
VOIP_TURN_PORT=3478
|
385
|
386
|
VOIP_TURN_TLS_PORT=5349
|
386
|
387
|
VOIP_TURN_NONCE=
|
|
@@ -1320,6 +1321,9 @@ function read_configuration {
|
1320
|
1321
|
if grep -q "SIP_PORT" $CONFIGURATION_FILE; then
|
1321
|
1322
|
SIP_PORT=$(grep "SIP_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1322
|
1323
|
fi
|
|
1324
|
+ if grep -q "SIP_TLS_PORT" $CONFIGURATION_FILE; then
|
|
1325
|
+ SIP_TLS_PORT=$(grep "SIP_TLS_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
1326
|
+ fi
|
1323
|
1327
|
if grep -q "SIP_SERVER_PASSWORD" $CONFIGURATION_FILE; then
|
1324
|
1328
|
SIP_SERVER_PASSWORD=$(grep "SIP_SERVER_PASSWORD" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1325
|
1329
|
fi
|
|
@@ -4032,11 +4036,11 @@ function configure_firewall_for_voip_turn {
|
4032
|
4036
|
}
|
4033
|
4037
|
|
4034
|
4038
|
|
4035
|
|
-function configure_firewall_for_sip3 {
|
|
4039
|
+function configure_firewall_for_sip4 {
|
4036
|
4040
|
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" ]]; then
|
4037
|
4041
|
return
|
4038
|
4042
|
fi
|
4039
|
|
- if grep -Fxq "configure_firewall_for_sip3" $COMPLETION_FILE; then
|
|
4043
|
+ if grep -Fxq "configure_firewall_for_sip4" $COMPLETION_FILE; then
|
4040
|
4044
|
return
|
4041
|
4045
|
fi
|
4042
|
4046
|
if [[ $ONION_ONLY != "no" ]]; then
|
|
@@ -4044,8 +4048,10 @@ function configure_firewall_for_sip3 {
|
4044
|
4048
|
fi
|
4045
|
4049
|
iptables -A INPUT -p udp --dport $SIP_PORT -j ACCEPT
|
4046
|
4050
|
iptables -A INPUT -p tcp --dport $SIP_PORT -j ACCEPT
|
|
4051
|
+ iptables -A INPUT -p udp --dport $SIP_TLS_PORT -j ACCEPT
|
|
4052
|
+ iptables -A INPUT -p tcp --dport $SIP_TLS_PORT -j ACCEPT
|
4047
|
4053
|
save_firewall_settings
|
4048
|
|
- echo 'configure_firewall_for_sip3' >> $COMPLETION_FILE
|
|
4054
|
+ echo 'configure_firewall_for_sip4' >> $COMPLETION_FILE
|
4049
|
4055
|
}
|
4050
|
4056
|
|
4051
|
4057
|
function configure_firewall_for_ipfs {
|
|
@@ -10352,7 +10358,7 @@ function install_sip {
|
10352
|
10358
|
echo '</sipwitch>' >> /etc/sipwitch.conf
|
10353
|
10359
|
|
10354
|
10360
|
sed -i 's|#PLUGINS=|PLUGINS=|g' /etc/default/sipwitch
|
10355
|
|
- sed -i 's|PLUGINS=.*|PLUGINS="zeroconf subscriber forward"|g' /etc/default/sipwitch
|
|
10361
|
+ sed -i 's|PLUGINS=.*|PLUGINS="zeroconf subscriber forward"|g' /etc/default/sipwitch
|
10356
|
10362
|
groupadd sipwitch
|
10357
|
10363
|
usermod -aG sipwitch $MY_USERNAME
|
10358
|
10364
|
|