Преглед на файлове

Remove owncloud from add/remove users

Bob Mottram преди 9 години
родител
ревизия
61731ecf7a
променени са 2 файла, в които са добавени 0 реда и са изтрити 29 реда
  1. 0
    24
      src/freedombone-adduser
  2. 0
    5
      src/freedombone-rmuser

+ 0
- 24
src/freedombone-adduser Целия файл

@@ -277,30 +277,6 @@ if grep -q "install_gnu_social" $COMPLETION_FILE; then
277 277
     fi
278 278
 fi
279 279
 
280
-if grep -q "install_owncloud_repo" $COMPLETION_FILE; then
281
-    export OC_PASS="$NEW_USER_PASSWORD"
282
-    OWNCLOUD_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Owncloud domain" | awk -F ':' '{print $2}')
283
-    /var/www/owncloud/occ user:add --password-from-env --display-name="$MY_USERNAME" --group="users" $MY_USERNAME
284
-    if [ ! "$?" = "0" ]; then
285
-        echo 'Owncloud user could not be added'
286
-        if grep -q "install_xmpp" $COMPLETION_FILE; then
287
-            ${PROJECT_NAME}-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
288
-        fi
289
-        if grep -q "Blog domain" $COMPLETION_FILE; then
290
-            if [ -f /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini ]; then
291
-                rm /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
292
-            fi
293
-        fi
294
-        if grep -q "install_sip" $COMPLETION_FILE; then
295
-            ${PROJECT_NAME}-rmsipuser $MY_USERNAME
296
-        fi
297
-        userdel -r $MY_USERNAME
298
-        export OC_PASS=""
299
-        exit 11
300
-    fi
301
-    export OC_PASS=""
302
-fi
303
-
304 280
 if grep -q "install_irc_client" $COMPLETION_FILE; then
305 281
     IRC_PORT=6697
306 282
     if grep -q "IRC_PORT" $CONFIGURATION_FILE; then

+ 0
- 5
src/freedombone-rmuser Целия файл

@@ -110,11 +110,6 @@ if [ -f /etc/nginx/.htpasswd ]; then
110 110
     fi
111 111
 fi
112 112
 
113
-if grep -q "install_owncloud_repo" $COMPLETION_FILE; then
114
-    OWNCLOUD_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Owncloud domain" | awk -F ':' '{print $2}')
115
-    /var/www/owncloud/occ user:delete $MY_USERNAME
116
-fi
117
-
118 113
 # remove user from SIP TURN/STUN
119 114
 if [ -d /etc/turnserver ]; then
120 115
     sed -i "/${MY_USERNAME}:/d" /etc/turnserver/turnusers.txt