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

Remove hourly script before stopping daemons

Bob Mottram преди 8 години
родител
ревизия
1dd5228ef6
променени са 2 файла, в които са добавени 7 реда и са изтрити 6 реда
  1. 3
    3
      src/freedombone-app-gnusocial
  2. 4
    3
      src/freedombone-app-postactiv

+ 3
- 3
src/freedombone-app-gnusocial Целия файл

430
     echo "Removing $GNUSOCIAL_DOMAIN_NAME"
430
     echo "Removing $GNUSOCIAL_DOMAIN_NAME"
431
     nginx_dissite $GNUSOCIAL_DOMAIN_NAME
431
     nginx_dissite $GNUSOCIAL_DOMAIN_NAME
432
     remove_certs $GNUSOCIAL_DOMAIN_NAME
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
     if [ -f /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
436
     if [ -f /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
434
         cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
437
         cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
435
         ./scripts/stopdaemons.sh
438
         ./scripts/stopdaemons.sh
450
     remove_app gnusocial
453
     remove_app gnusocial
451
     remove_completion_param install_gnusocial
454
     remove_completion_param install_gnusocial
452
     sed -i '/gnusocial/d' $COMPLETION_FILE
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
     remove_backup_database_local gnusocial
456
     remove_backup_database_local gnusocial
457
 
457
 
458
     function_check remove_ddns_domain
458
     function_check remove_ddns_domain

+ 4
- 3
src/freedombone-app-postactiv Целия файл

408
     echo "Removing $POSTACTIV_DOMAIN_NAME"
408
     echo "Removing $POSTACTIV_DOMAIN_NAME"
409
     nginx_dissite $POSTACTIV_DOMAIN_NAME
409
     nginx_dissite $POSTACTIV_DOMAIN_NAME
410
     remove_certs $POSTACTIV_DOMAIN_NAME
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
     if [ -f /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
414
     if [ -f /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
412
         cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
415
         cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
413
         ./scripts/stopdaemons.sh
416
         ./scripts/stopdaemons.sh
414
     fi
417
     fi
418
+
415
     if [ -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
419
     if [ -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
416
         rm -rf /var/www/$POSTACTIV_DOMAIN_NAME
420
         rm -rf /var/www/$POSTACTIV_DOMAIN_NAME
417
     fi
421
     fi
428
     remove_app postactiv
432
     remove_app postactiv
429
     remove_completion_param install_postactiv
433
     remove_completion_param install_postactiv
430
     sed -i '/postactiv/d' $COMPLETION_FILE
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
     remove_backup_database_local postactiv
435
     remove_backup_database_local postactiv
435
 
436
 
436
     function_check remove_ddns_domain
437
     function_check remove_ddns_domain