From 932100d8622b6cb4328f670e2aab5c9365c7ce01 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 2 Nov 2015 10:56:02 +0000
Subject: [PATCH] Remove SIP user when using rmuser

---
 src/freedombone            | 2 ++
 src/freedombone-addsipuser | 1 +
 src/freedombone-adduser    | 4 ++++
 src/freedombone-rmuser     | 8 +++++++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/freedombone b/src/freedombone
index 7dd267fd..bae00119 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -10999,6 +10999,8 @@ function install_sip {
   echo '</sipwitch>' >> /etc/sipwitch.conf
 
   sed -i 's|#PLUGINS=|PLUGINS=|g' /etc/default/sipwitch
+  groupadd sipwitch
+  usermod -aG sipwitch $MY_USERNAME
 
   service sipwitch start
 
diff --git a/src/freedombone-addsipuser b/src/freedombone-addsipuser
index 0f0585c9..227f521f 100755
--- a/src/freedombone-addsipuser
+++ b/src/freedombone-addsipuser
@@ -100,6 +100,7 @@ function add_sip_user {
         echo "$line" >> $NEW_CONFIG_FILE
     done
     mv $NEW_CONFIG_FILE $CONFIG_FILE
+    usermod -aG sipwitch $MY_USERNAME
 }
 
 while [[ $# > 1 ]]
diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index f01894ac..6e32160e 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -34,6 +34,7 @@ SSH_PUBLIC_KEY="$2"
 GPG_KEYSERVER='hkp://keys.gnupg.net'
 SSH_PORT=2222
 COMPLETION_FILE=$HOME/freedombone-completed.txt
+SIP_EXTENSION=
 
 if [ ! $MY_USERNAME ]; then
     echo 'No username was given'
@@ -214,6 +215,9 @@ fi
 
 clear
 echo "New user $MY_USERNAME was created"
+if [ $SIP_EXTENSION ]; then
+	echo "Their SIP phone extension is $SIP_EXTENSION"
+fi
 echo "Their login password is $NEW_USER_PASSWORD"
 echo ''
 echo 'IMPORTANT: Make a note of the password, because it will not be saved'
diff --git a/src/freedombone-rmuser b/src/freedombone-rmuser
index 54f330c1..b26081b2 100755
--- a/src/freedombone-rmuser
+++ b/src/freedombone-rmuser
@@ -41,7 +41,9 @@ if [[ $yn != 'y' && $yn != 'Y' && $yn != 'yes' && $yn != 'Yes' && $yn != 'YES' ]
     exit 7
 fi
 
-freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
+if grep -q "install_xmpp" $COMPLETION_FILE; then
+    freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
+fi
 
 if grep -q "Blog domain" $COMPLETION_FILE; then
     FULLBLOG_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Blog domain" | awk -F ':' '{print $2}')
@@ -50,6 +52,10 @@ if grep -q "Blog domain" $COMPLETION_FILE; then
     fi
 fi
 
+if grep -q "install_sip" $COMPLETION_FILE; then
+    freedombone-rmsipuser $MY_USERNAME
+fi
+
 userdel -r $MY_USERNAME
 
 if [ -d /home/$MY_USERNAME ]; then