From 582838aafacaf630637080dd4ced33292a7d53d6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 10 Aug 2015 21:54:53 +0100
Subject: [PATCH] Install voip server on mesh peers

---
 src/freedombone | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index 684f8743..fa156e78 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -5818,7 +5818,7 @@ function save_firewall_settings {
 }
 
 function configure_firewall_for_voip {
-  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
+  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
       return
   fi
   if grep -Fxq "configure_firewall_for_voip" $COMPLETION_FILE; then
@@ -10050,7 +10050,7 @@ function get_voip_server_password {
 }
 
 function install_voip {
-  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
+  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
       return
   fi
   if grep -Fxq "install_voip" $COMPLETION_FILE; then
@@ -10084,7 +10084,7 @@ function install_voip {
 
   sed -i "s|welcometext=.*|welcometext=\"<br />Welcome to $DEFAULT_DOMAIN_NAME <b>VoIP</b>.<br />Chat freely!<br />\"|g" /etc/mumble-server.ini
 
-  if [ $VOIP_SERVER_PASSWORD ]; then
+  if [[ $VOIP_SERVER_PASSWORD && $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
       sed -i "s|serverpassword=.*|serverpassword=$VOIP_SERVER_PASSWORD|g" /etc/mumble-server.ini
   fi
 
@@ -10117,7 +10117,9 @@ function install_voip {
       echo 'VoIP Server' >> /home/$MY_USERNAME/README
       echo '===========' >> /home/$MY_USERNAME/README
       echo 'VoIP server username: mumble-server' >> /home/$MY_USERNAME/README
-      echo "VoIP server password: $VOIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
+      if [[ $SYSTEM_TYPE != "VARIANT_MESH" ]]; then
+          echo "VoIP server password: $VOIP_SERVER_PASSWORD" >> /home/$MY_USERNAME/README
+      fi
       echo '' >> /home/$MY_USERNAME/README
       echo 'To connect to the VoIP server use your username and the server password shown above.' >> /home/$MY_USERNAME/README
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README