Parcourir la source

Ensure that a domain is provided before removing

Bob Mottram il y a 8 ans
Parent
révision
5025c5c227

+ 3
- 0
src/freedombone-app-blog Voir le fichier

332
     if [[ $(app_is_installed blog) == "0" ]]; then
332
     if [[ $(app_is_installed blog) == "0" ]]; then
333
         return
333
         return
334
     fi
334
     fi
335
+    if [ ${#FULLBLOG_DOMAIN_NAME} -eq 0 ]; then
336
+        return
337
+    fi
335
 
338
 
336
     if grep -q "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
339
     if grep -q "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
337
         FULLBLOG_DOMAIN_NAME=$(grep "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
340
         FULLBLOG_DOMAIN_NAME=$(grep "FULLBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')

+ 3
- 0
src/freedombone-app-gnusocial Voir le fichier

350
     if [[ $(app_is_installed gnusocial) == "0" ]]; then
350
     if [[ $(app_is_installed gnusocial) == "0" ]]; then
351
         return
351
         return
352
     fi
352
     fi
353
+    if [ ${#MICROBLOG_DOMAIN_NAME} -eq 0 ]; then
354
+        return
355
+    fi
353
     if grep -q "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
356
     if grep -q "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE; then
354
         MICROBLOG_DOMAIN_NAME=$(grep "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | head -n 1 | awk -F '=' '{print $2}')
357
         MICROBLOG_DOMAIN_NAME=$(grep "MICROBLOG_DOMAIN_NAME" $CONFIGURATION_FILE | head -n 1 | awk -F '=' '{print $2}')
355
     fi
358
     fi

+ 3
- 0
src/freedombone-app-gogs Voir le fichier

380
         return
380
         return
381
     fi
381
     fi
382
 
382
 
383
+    if [ ${#GIT_DOMAIN_NAME} -eq 0 ]; then
384
+        return
385
+    fi
383
     systemctl stop gogs
386
     systemctl stop gogs
384
     systemctl disable gogs
387
     systemctl disable gogs
385
     nginx_dissite ${GIT_DOMAIN_NAME}
388
     nginx_dissite ${GIT_DOMAIN_NAME}

+ 3
- 0
src/freedombone-app-hubzilla Voir le fichier

319
     if [[ $(app_is_installed hubzilla) == "0" ]]; then
319
     if [[ $(app_is_installed hubzilla) == "0" ]]; then
320
         return
320
         return
321
     fi
321
     fi
322
+    if [ ${#HUBZILLA_DOMAIN_NAME} -eq 0 ]; then
323
+        return
324
+    fi
322
     echo $'Removing Hubzilla'
325
     echo $'Removing Hubzilla'
323
     nginx_dissite $HUBZILLA_DOMAIN_NAME
326
     nginx_dissite $HUBZILLA_DOMAIN_NAME
324
     if [ -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
327
     if [ -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then

+ 4
- 0
src/freedombone-app-rss Voir le fichier

246
     if [[ $(app_is_installed rss) == "0" ]]; then
246
     if [[ $(app_is_installed rss) == "0" ]]; then
247
         return
247
         return
248
     fi
248
     fi
249
+    if [ ${#RSS_READER_DOMAIN_NAME} -eq 0 ]; then
250
+        return
251
+    fi
252
+
249
     nginx_dissite $RSS_READER_DOMAIN_NAME
253
     nginx_dissite $RSS_READER_DOMAIN_NAME
250
     function_check remove_onion_service
254
     function_check remove_onion_service
251
     remove_onion_service ttrss ${RSS_READER_ONION_PORT} ${RSS_MOBILE_READER_ONION_PORT}
255
     remove_onion_service ttrss ${RSS_READER_ONION_PORT} ${RSS_MOBILE_READER_ONION_PORT}

+ 2
- 2
src/freedombone-app-wiki Voir le fichier

212
     if [[ $(app_is_installed wiki) == "0" ]]; then
212
     if [[ $(app_is_installed wiki) == "0" ]]; then
213
         return
213
         return
214
     fi
214
     fi
215
-    if grep -q "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE; then
216
-        WIKI_DOMAIN_NAME=$(grep "WIKI_DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
215
+    if [ ${#WIKI_DOMAIN_NAME} -eq 0 ]; then
216
+        return
217
     fi
217
     fi
218
     function_check remove_onion_service
218
     function_check remove_onion_service
219
     remove_onion_service wiki ${WIKI_ONION_PORT}
219
     remove_onion_service wiki ${WIKI_ONION_PORT}