Browse Source

More exact match of daemon names

Bob Mottram 8 years ago
parent
commit
cc952a9c07
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      src/freedombone-app-gnusocial
  2. 1
    1
      src/freedombone-app-postactiv

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

225
 function gnusocial_running_script {
225
 function gnusocial_running_script {
226
     # check that the daemon is running
226
     # check that the daemon is running
227
     echo '#!/bin/bash' > /etc/cron.hourly/gnusocial-daemons
227
     echo '#!/bin/bash' > /etc/cron.hourly/gnusocial-daemons
228
-    echo 'daemon_lines=$(ps aux | grep "scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/gnusocial-daemons
228
+    echo 'daemon_lines=$(ps aux | grep "${GNUSOCIAL_DOMAIN_NAME}/htdocs/scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/gnusocial-daemons
229
     echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/gnusocial-daemons
229
     echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/gnusocial-daemons
230
 
230
 
231
     echo "    ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')" >> /etc/cron.hourly/gnusocial-daemons
231
     echo "    ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')" >> /etc/cron.hourly/gnusocial-daemons

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

199
 function postactiv_running_script {
199
 function postactiv_running_script {
200
     # check that the daemon is running
200
     # check that the daemon is running
201
     echo '#!/bin/bash' > /etc/cron.hourly/postactiv-daemons
201
     echo '#!/bin/bash' > /etc/cron.hourly/postactiv-daemons
202
-    echo 'daemon_lines=$(ps aux | grep "scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/postactiv-daemons
202
+    echo 'daemon_lines=$(ps aux | grep "${POSTACTIV_DOMAIN_NAME}/htdocs/scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/postactiv-daemons
203
     echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/postactiv-daemons
203
     echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/postactiv-daemons
204
 
204
 
205
     echo "    ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')" >> /etc/cron.hourly/postactiv-daemons
205
     echo "    ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')" >> /etc/cron.hourly/postactiv-daemons