Browse Source

Install voip server on mesh peers

Bob Mottram 10 years ago
parent
commit
582838aafa
1 changed files with 6 additions and 4 deletions
  1. 6
    4
      src/freedombone

+ 6
- 4
src/freedombone View File

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