ソースを参照

Remove SIP user when using rmuser

Bob Mottram 9 年 前
コミット
932100d862
共有4 個のファイルを変更した14 個の追加1 個の削除を含む
  1. 2
    0
      src/freedombone
  2. 1
    0
      src/freedombone-addsipuser
  3. 4
    0
      src/freedombone-adduser
  4. 7
    1
      src/freedombone-rmuser

+ 2
- 0
src/freedombone ファイルの表示

@@ -10999,6 +10999,8 @@ function install_sip {
10999 10999
   echo '</sipwitch>' >> /etc/sipwitch.conf
11000 11000
 
11001 11001
   sed -i 's|#PLUGINS=|PLUGINS=|g' /etc/default/sipwitch
11002
+  groupadd sipwitch
11003
+  usermod -aG sipwitch $MY_USERNAME
11002 11004
 
11003 11005
   service sipwitch start
11004 11006
 

+ 1
- 0
src/freedombone-addsipuser ファイルの表示

@@ -100,6 +100,7 @@ function add_sip_user {
100 100
         echo "$line" >> $NEW_CONFIG_FILE
101 101
     done
102 102
     mv $NEW_CONFIG_FILE $CONFIG_FILE
103
+    usermod -aG sipwitch $MY_USERNAME
103 104
 }
104 105
 
105 106
 while [[ $# > 1 ]]

+ 4
- 0
src/freedombone-adduser ファイルの表示

@@ -34,6 +34,7 @@ SSH_PUBLIC_KEY="$2"
34 34
 GPG_KEYSERVER='hkp://keys.gnupg.net'
35 35
 SSH_PORT=2222
36 36
 COMPLETION_FILE=$HOME/freedombone-completed.txt
37
+SIP_EXTENSION=
37 38
 
38 39
 if [ ! $MY_USERNAME ]; then
39 40
     echo 'No username was given'
@@ -214,6 +215,9 @@ fi
214 215
 
215 216
 clear
216 217
 echo "New user $MY_USERNAME was created"
218
+if [ $SIP_EXTENSION ]; then
219
+	echo "Their SIP phone extension is $SIP_EXTENSION"
220
+fi
217 221
 echo "Their login password is $NEW_USER_PASSWORD"
218 222
 echo ''
219 223
 echo 'IMPORTANT: Make a note of the password, because it will not be saved'

+ 7
- 1
src/freedombone-rmuser ファイルの表示

@@ -41,7 +41,9 @@ if [[ $yn != 'y' && $yn != 'Y' && $yn != 'yes' && $yn != 'Yes' && $yn != 'YES' ]
41 41
     exit 7
42 42
 fi
43 43
 
44
-freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
44
+if grep -q "install_xmpp" $COMPLETION_FILE; then
45
+    freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
46
+fi
45 47
 
46 48
 if grep -q "Blog domain" $COMPLETION_FILE; then
47 49
     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
50 52
     fi
51 53
 fi
52 54
 
55
+if grep -q "install_sip" $COMPLETION_FILE; then
56
+    freedombone-rmsipuser $MY_USERNAME
57
+fi
58
+
53 59
 userdel -r $MY_USERNAME
54 60
 
55 61
 if [ -d /home/$MY_USERNAME ]; then