Bob Mottram 8 лет назад
Родитель
Сommit
1d7981b2b6
1 измененных файлов: 9 добавлений и 3 удалений
  1. 9
    3
      src/freedombone-app-gnusocial

+ 9
- 3
src/freedombone-app-gnusocial Просмотреть файл

@@ -443,7 +443,7 @@ function restore_remote_gnusocial {
443 443
 
444 444
         # stop the daemons
445 445
         cd /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
446
-        scripts/stopdaemons.sh
446
+        ./scripts/stopdaemons.sh
447 447
 
448 448
         function_check gnusocial_create_database
449 449
         gnusocial_create_database
@@ -456,7 +456,7 @@ function restore_remote_gnusocial {
456 456
 
457 457
         # start the daemons
458 458
         cd /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
459
-        scripts/startdaemons.sh
459
+        ./scripts/startdaemons.sh
460 460
         echo $"Restore of gnusocial complete"
461 461
     fi
462 462
 }
@@ -470,6 +470,10 @@ function remove_gnusocial {
470 470
     echo "Removing $GNUSOCIAL_DOMAIN_NAME"
471 471
     nginx_dissite $GNUSOCIAL_DOMAIN_NAME
472 472
     remove_certs $GNUSOCIAL_DOMAIN_NAME
473
+    if [ -f /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
474
+        cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
475
+        ./scripts/stopdaemons.sh
476
+    fi
473 477
     if [ -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
474 478
         rm -rf /var/www/$GNUSOCIAL_DOMAIN_NAME
475 479
     fi
@@ -486,7 +490,9 @@ function remove_gnusocial {
486 490
     remove_app gnusocial
487 491
     remove_completion_param install_gnusocial
488 492
     sed -i '/gnusocial /d' $COMPLETION_FILE
489
-    pkill queuedaemon
493
+    if [ -f /etc/cron.hourly/gnusocial-daemons ]; then
494
+        rm /etc/cron.hourly/gnusocial-daemons
495
+    fi
490 496
 }
491 497
 
492 498
 function install_gnusocial_main {