瀏覽代碼

Adding owncloud users

Bob Mottram 9 年之前
父節點
當前提交
702f28cf15
共有 1 個文件被更改,包括 14 次插入2 次删除
  1. 14
    2
      src/freedombone-adduser

+ 14
- 2
src/freedombone-adduser 查看文件

@@ -205,7 +205,7 @@ if grep -q "Blog domain" $COMPLETION_FILE; then
205 205
 fi
206 206
 
207 207
 if grep -q "install_sip" $COMPLETION_FILE; then
208
-	SIP_EXTENSION=$(freedombone-sipfreeext)
208
+    SIP_EXTENSION=$(freedombone-sipfreeext)
209 209
     freedombone-addsipuser -u $MY_USERNAME -e $SIP_EXTENSION -p "$NEW_USER_PASSWORD"
210 210
     if [ ! "$?" = "0" ]; then
211 211
         echo 'SIP user could not be added. Ensure that extension numbers are in order and do no exceed 299'
@@ -214,10 +214,22 @@ if grep -q "install_sip" $COMPLETION_FILE; then
214 214
     fi
215 215
 fi
216 216
 
217
+if grep -q "install_owncloud" $COMPLETION_FILE; then
218
+    export OC_PASS="$NEW_USER_PASSWORD"
219
+    occ user:add --password-from-env --display-name="$MY_USERNAME" --group="users" $MY_USERNAME
220
+    if [ ! "$?" = "0" ]; then
221
+        echo 'Owncloud user could not be added'
222
+        freedombone-rmsipuser $MY_USERNAME
223
+        userdel -r $MY_USERNAME
224
+        exit 11
225
+    fi
226
+    export OC_PASS=""
227
+fi
228
+
217 229
 clear
218 230
 echo "New user $MY_USERNAME was created"
219 231
 if [ $SIP_EXTENSION ]; then
220
-	echo "Their SIP phone extension is $SIP_EXTENSION"
232
+    echo "Their SIP phone extension is $SIP_EXTENSION"
221 233
 fi
222 234
 echo "Their login password is $NEW_USER_PASSWORD"
223 235
 echo ''