|
@@ -5818,7 +5818,7 @@ function save_firewall_settings {
|
5818
|
5818
|
}
|
5819
|
5819
|
|
5820
|
5820
|
function configure_firewall_for_voip {
|
5821
|
|
- 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
|
|
5821
|
+ 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
|
5822
|
5822
|
return
|
5823
|
5823
|
fi
|
5824
|
5824
|
if grep -Fxq "configure_firewall_for_voip" $COMPLETION_FILE; then
|
|
@@ -10050,7 +10050,7 @@ function get_voip_server_password {
|
10050
|
10050
|
}
|
10051
|
10051
|
|
10052
|
10052
|
function install_voip {
|
10053
|
|
- 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
|
|
10053
|
+ 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
|
10054
|
10054
|
return
|
10055
|
10055
|
fi
|
10056
|
10056
|
if grep -Fxq "install_voip" $COMPLETION_FILE; then
|
|
@@ -10084,7 +10084,7 @@ function install_voip {
|
10084
|
10084
|
|
10085
|
10085
|
sed -i "s|welcometext=.*|welcometext=\"<br />Welcome to $DEFAULT_DOMAIN_NAME <b>VoIP</b>.<br />Chat freely!<br />\"|g" /etc/mumble-server.ini
|
10086
|
10086
|
|
10087
|
|
- if [ $VOIP_SERVER_PASSWORD ]; then
|
|
10087
|
+ if [[ $VOIP_SERVER_PASSWORD && $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
|
10088
|
10088
|
sed -i "s|serverpassword=.*|serverpassword=$VOIP_SERVER_PASSWORD|g" /etc/mumble-server.ini
|
10089
|
10089
|
fi
|
10090
|
10090
|
|
|
@@ -10117,7 +10117,9 @@ function install_voip {
|
10117
|
10117
|
echo 'VoIP Server' >> /home/$MY_USERNAME/README
|
10118
|
10118
|
echo '===========' >> /home/$MY_USERNAME/README
|
10119
|
10119
|
echo 'VoIP server username: mumble-server' >> /home/$MY_USERNAME/README
|
10120
|
|
- echo "VoIP server password: $VOIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
|
|
10120
|
+ if [[ $SYSTEM_TYPE != "VARIANT_MESH" ]]; then
|
|
10121
|
+ echo "VoIP server password: $VOIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
|
|
10122
|
+ fi
|
10121
|
10123
|
echo '' >> /home/$MY_USERNAME/README
|
10122
|
10124
|
echo 'To connect to the VoIP server use your username and the server password shown above.' >> /home/$MY_USERNAME/README
|
10123
|
10125
|
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
|