Quellcode durchsuchen

Remove hourly script before stopping daemons

Bob Mottram vor 8 Jahren
Ursprung
Commit
1dd5228ef6
2 geänderte Dateien mit 7 neuen und 6 gelöschten Zeilen
  1. 3
    3
      src/freedombone-app-gnusocial
  2. 4
    3
      src/freedombone-app-postactiv

+ 3
- 3
src/freedombone-app-gnusocial Datei anzeigen

@@ -430,6 +430,9 @@ function remove_gnusocial {
430 430
     echo "Removing $GNUSOCIAL_DOMAIN_NAME"
431 431
     nginx_dissite $GNUSOCIAL_DOMAIN_NAME
432 432
     remove_certs $GNUSOCIAL_DOMAIN_NAME
433
+    if [ -f /etc/cron.hourly/gnusocial-daemons ]; then
434
+        rm /etc/cron.hourly/gnusocial-daemons
435
+    fi
433 436
     if [ -f /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
434 437
         cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
435 438
         ./scripts/stopdaemons.sh
@@ -450,9 +453,6 @@ function remove_gnusocial {
450 453
     remove_app gnusocial
451 454
     remove_completion_param install_gnusocial
452 455
     sed -i '/gnusocial/d' $COMPLETION_FILE
453
-    if [ -f /etc/cron.hourly/gnusocial-daemons ]; then
454
-        rm /etc/cron.hourly/gnusocial-daemons
455
-    fi
456 456
     remove_backup_database_local gnusocial
457 457
 
458 458
     function_check remove_ddns_domain

+ 4
- 3
src/freedombone-app-postactiv Datei anzeigen

@@ -408,10 +408,14 @@ function remove_postactiv {
408 408
     echo "Removing $POSTACTIV_DOMAIN_NAME"
409 409
     nginx_dissite $POSTACTIV_DOMAIN_NAME
410 410
     remove_certs $POSTACTIV_DOMAIN_NAME
411
+    if [ -f /etc/cron.hourly/postactiv-daemons ]; then
412
+        rm /etc/cron.hourly/postactiv-daemons
413
+    fi
411 414
     if [ -f /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
412 415
         cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
413 416
         ./scripts/stopdaemons.sh
414 417
     fi
418
+
415 419
     if [ -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
416 420
         rm -rf /var/www/$POSTACTIV_DOMAIN_NAME
417 421
     fi
@@ -428,9 +432,6 @@ function remove_postactiv {
428 432
     remove_app postactiv
429 433
     remove_completion_param install_postactiv
430 434
     sed -i '/postactiv/d' $COMPLETION_FILE
431
-    if [ -f /etc/cron.hourly/postactiv-daemons ]; then
432
-        rm /etc/cron.hourly/postactiv-daemons
433
-    fi
434 435
     remove_backup_database_local postactiv
435 436
 
436 437
     function_check remove_ddns_domain