Browse Source

gnusocial queuedaemons use www-data

Bob Mottram 8 years ago
parent
commit
86371327cf

+ 5
- 5
src/freedombone-app-gnusocial View File

404
         gnusocial_dir=/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
404
         gnusocial_dir=/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
405
         # stop the daemons
405
         # stop the daemons
406
         cd $gnusocial_dir
406
         cd $gnusocial_dir
407
-        scripts/stopdaemons.sh
407
+        su -c "sh scripts/stopdaemons.sh" -s /bin/sh www-data
408
 
408
 
409
         function_check gnusocial_create_database
409
         function_check gnusocial_create_database
410
         gnusocial_create_database
410
         gnusocial_create_database
416
 
416
 
417
         # start the daemons
417
         # start the daemons
418
         cd $gnusocial_dir
418
         cd $gnusocial_dir
419
-        scripts/startdaemons.sh
419
+        su -c "sh scripts/startdaemons.sh" -s /bin/sh www-data
420
         echo $"Restore of gnusocial complete"
420
         echo $"Restore of gnusocial complete"
421
     fi
421
     fi
422
 }
422
 }
452
 
452
 
453
         # stop the daemons
453
         # stop the daemons
454
         cd /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
454
         cd /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
455
-        ./scripts/stopdaemons.sh
455
+        su -c "sh scripts/stopdaemons.sh" -s /bin/sh www-data
456
 
456
 
457
         function_check gnusocial_create_database
457
         function_check gnusocial_create_database
458
         gnusocial_create_database
458
         gnusocial_create_database
465
 
465
 
466
         # start the daemons
466
         # start the daemons
467
         cd /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
467
         cd /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs
468
-        ./scripts/startdaemons.sh
468
+        su -c "sh scripts/startdaemons.sh" -s /bin/sh www-data
469
         echo $"Restore of gnusocial complete"
469
         echo $"Restore of gnusocial complete"
470
     fi
470
     fi
471
 }
471
 }
487
     fi
487
     fi
488
     if [ -f /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
488
     if [ -f /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
489
         cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
489
         cd /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts
490
-        ./scripts/stopdaemons.sh
490
+        su -c "sh scripts/stopdaemons.sh" -s /bin/sh www-data
491
     fi
491
     fi
492
     kill_pid=$(ps aux | grep /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/queuedaemon.php | awk -F ' ' '{print $2}' | head -n 1)
492
     kill_pid=$(ps aux | grep /var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/scripts/queuedaemon.php | awk -F ' ' '{print $2}' | head -n 1)
493
     kill -9 $kill_pid
493
     kill -9 $kill_pid

+ 5
- 5
src/freedombone-app-postactiv View File

411
         postactiv_dir=/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs
411
         postactiv_dir=/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs
412
         # stop the daemons
412
         # stop the daemons
413
         cd $postactiv_dir
413
         cd $postactiv_dir
414
-        scripts/stopdaemons.sh
414
+        su -c "sh scripts/stopdaemons.sh" -s /bin/sh www-data
415
 
415
 
416
         function_check postactiv_create_database
416
         function_check postactiv_create_database
417
         postactiv_create_database
417
         postactiv_create_database
423
 
423
 
424
         # start the daemons
424
         # start the daemons
425
         cd $postactiv_dir
425
         cd $postactiv_dir
426
-        scripts/startdaemons.sh
426
+        su -c "sh scripts/startdaemons.sh" -s /bin/sh www-data
427
     fi
427
     fi
428
 }
428
 }
429
 
429
 
455
 
455
 
456
         # stop the daemons
456
         # stop the daemons
457
         cd /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs
457
         cd /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs
458
-        ./scripts/stopdaemons.sh
458
+        su -c "sh scripts/stopdaemons.sh" -s /bin/sh www-data
459
 
459
 
460
         function_check postactiv_create_database
460
         function_check postactiv_create_database
461
         postactiv_create_database
461
         postactiv_create_database
468
 
468
 
469
         # start the daemons
469
         # start the daemons
470
         cd /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs
470
         cd /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs
471
-        ./scripts/startdaemons.sh
471
+        su -c "sh scripts/startdaemons.sh" -s /bin/sh www-data
472
     fi
472
     fi
473
 }
473
 }
474
 
474
 
489
     fi
489
     fi
490
     if [ -f /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
490
     if [ -f /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/stopdaemons.sh ]; then
491
         cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
491
         cd /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts
492
-        ./scripts/stopdaemons.sh
492
+        su -c "sh scripts/stopdaemons.sh" -s /bin/sh www-data
493
     fi
493
     fi
494
     kill_pid=$(ps aux | grep /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/queuedaemon.php | awk -F ' ' '{print $2}' | head -n 1)
494
     kill_pid=$(ps aux | grep /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/scripts/queuedaemon.php | awk -F ' ' '{print $2}' | head -n 1)
495
     kill -9 $kill_pid
495
     kill -9 $kill_pid

+ 1
- 1
src/freedombone-utils-gnusocialtools View File

468
     echo '    MY_EMAIL_ADDRESS=$ADMIN_USER@$HOSTNAME' >> /etc/cron.hourly/${gnusocial_type}-daemons
468
     echo '    MY_EMAIL_ADDRESS=$ADMIN_USER@$HOSTNAME' >> /etc/cron.hourly/${gnusocial_type}-daemons
469
     echo -n "    echo \"Restarting ${gnusocial_type} daemons\" | mail -s \"${gnusocial_type} " >> /etc/cron.hourly/${gnusocial_type}-daemons
469
     echo -n "    echo \"Restarting ${gnusocial_type} daemons\" | mail -s \"${gnusocial_type} " >> /etc/cron.hourly/${gnusocial_type}-daemons
470
     echo 'daemons not found" $MY_EMAIL_ADDRESS' >> /etc/cron.hourly/${gnusocial_type}-daemons
470
     echo 'daemons not found" $MY_EMAIL_ADDRESS' >> /etc/cron.hourly/${gnusocial_type}-daemons
471
-    echo '    scripts/startdaemons.sh' >> /etc/cron.hourly/${gnusocial_type}-daemons
471
+    echo '    su -c "sh scripts/startdaemons.sh" -s /bin/sh www-data' >> /etc/cron.hourly/${gnusocial_type}-daemons
472
     echo 'fi' >> /etc/cron.hourly/${gnusocial_type}-daemons
472
     echo 'fi' >> /etc/cron.hourly/${gnusocial_type}-daemons
473
 
473
 
474
     echo 'php scripts/delete_orphan_files.php > /dev/null' >> /etc/cron.hourly/${gnusocial_type}-daemons
474
     echo 'php scripts/delete_orphan_files.php > /dev/null' >> /etc/cron.hourly/${gnusocial_type}-daemons