|
@@ -35,6 +35,7 @@ GPG_KEYSERVER='hkp://keys.gnupg.net'
|
35
|
35
|
SSH_PORT=2222
|
36
|
36
|
COMPLETION_FILE=$HOME/freedombone-completed.txt
|
37
|
37
|
SIP_EXTENSION=
|
|
38
|
+FULLBLOG_DOMAIN_NAME=
|
38
|
39
|
|
39
|
40
|
if [ ! $MY_USERNAME ]; then
|
40
|
41
|
echo 'No username was given'
|
|
@@ -193,6 +194,9 @@ if grep -q "Blog domain" $COMPLETION_FILE; then
|
193
|
194
|
FULLBLOG_DOMAIN_NAME=$(cat $COMPLETION_FILE | grep "Blog domain" | awk -F ':' '{print $2}')
|
194
|
195
|
if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users ]; then
|
195
|
196
|
echo 'Blog users directory not found'
|
|
197
|
+ if grep -q "install_xmpp" $COMPLETION_FILE; then
|
|
198
|
+ freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
|
|
199
|
+ fi
|
196
|
200
|
userdel -r $MY_USERNAME
|
197
|
201
|
exit 9
|
198
|
202
|
fi
|
|
@@ -209,6 +213,14 @@ if grep -q "install_sip" $COMPLETION_FILE; then
|
209
|
213
|
freedombone-addsipuser -u $MY_USERNAME -e $SIP_EXTENSION -p "$NEW_USER_PASSWORD"
|
210
|
214
|
if [ ! "$?" = "0" ]; then
|
211
|
215
|
echo 'SIP user could not be added. Ensure that extension numbers are in order and do no exceed 299'
|
|
216
|
+ if grep -q "install_xmpp" $COMPLETION_FILE; then
|
|
217
|
+ freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
|
|
218
|
+ fi
|
|
219
|
+ if grep -q "Blog domain" $COMPLETION_FILE; then
|
|
220
|
+ if [ -f /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini ]; then
|
|
221
|
+ rm /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
|
|
222
|
+ fi
|
|
223
|
+ fi
|
212
|
224
|
userdel -r $MY_USERNAME
|
213
|
225
|
exit 10
|
214
|
226
|
fi
|
|
@@ -219,8 +231,19 @@ if grep -q "install_owncloud" $COMPLETION_FILE; then
|
219
|
231
|
occ user:add --password-from-env --display-name="$MY_USERNAME" --group="users" $MY_USERNAME
|
220
|
232
|
if [ ! "$?" = "0" ]; then
|
221
|
233
|
echo 'Owncloud user could not be added'
|
222
|
|
- freedombone-rmsipuser $MY_USERNAME
|
|
234
|
+ if grep -q "install_xmpp" $COMPLETION_FILE; then
|
|
235
|
+ freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME"
|
|
236
|
+ fi
|
|
237
|
+ if grep -q "Blog domain" $COMPLETION_FILE; then
|
|
238
|
+ if [ -f /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini ]; then
|
|
239
|
+ rm /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
|
|
240
|
+ fi
|
|
241
|
+ fi
|
|
242
|
+ if grep -q "install_sip" $COMPLETION_FILE; then
|
|
243
|
+ freedombone-rmsipuser $MY_USERNAME
|
|
244
|
+ fi
|
223
|
245
|
userdel -r $MY_USERNAME
|
|
246
|
+ export OC_PASS=""
|
224
|
247
|
exit 11
|
225
|
248
|
fi
|
226
|
249
|
export OC_PASS=""
|