Browse Source

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram 7 years ago
parent
commit
b4b9c54c81
1 changed files with 10 additions and 7 deletions
  1. 10
    7
      src/freedombone-app-ghost

+ 10
- 7
src/freedombone-app-ghost View File

49
 function ghost_bust {
49
 function ghost_bust {
50
     # kill the started ghost process
50
     # kill the started ghost process
51
     kill_pid=$(ps aux | grep "ghost run" | awk -F ' ' '{print $2}' | head -n 1)
51
     kill_pid=$(ps aux | grep "ghost run" | awk -F ' ' '{print $2}' | head -n 1)
52
-    kill $kill_pid
52
+    kill -9 $kill_pid
53
+
54
+    kill_pid=$(ps aux | grep "ghost" | awk -F ' ' '{print $2}' | head -n 1)
55
+    kill -9 $kill_pid
53
 }
56
 }
54
 
57
 
55
 function logging_on_ghost {
58
 function logging_on_ghost {
185
 }
188
 }
186
 
189
 
187
 function upgrade_ghost {
190
 function upgrade_ghost {
191
+    read_config_param GHOST_DOMAIN_NAME
192
+
188
     if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then
193
     if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then
189
         return
194
         return
190
     fi
195
     fi
200
     ghost_replace_services
205
     ghost_replace_services
201
     ghost_remove_offsite_links
206
     ghost_remove_offsite_links
202
 
207
 
203
-    if [ -f /usr/local/bin/ghost ]; then
204
-        chown root:root /usr/local/bin/ghost
205
-    fi
208
+    chown root:root /usr/local/bin/ghost
209
+    chown -R root:root /usr/local/lib
206
     chown -R ghost: /var/www/${GHOST_DOMAIN_NAME}/htdocs
210
     chown -R ghost: /var/www/${GHOST_DOMAIN_NAME}/htdocs
207
     systemctl restart ghost
211
     systemctl restart ghost
208
 }
212
 }
529
     function_check add_ddns_domain
533
     function_check add_ddns_domain
530
     add_ddns_domain $GHOST_DOMAIN_NAME
534
     add_ddns_domain $GHOST_DOMAIN_NAME
531
 
535
 
532
-    if [ -f /usr/local/bin/ghost ]; then
533
-        chown root:root /usr/local/bin/ghost
534
-    fi
536
+    chown root:root /usr/local/bin/ghost
537
+    chown -R root:root /usr/local/lib
535
     chown -R ghost: /var/www/${GHOST_DOMAIN_NAME}/htdocs
538
     chown -R ghost: /var/www/${GHOST_DOMAIN_NAME}/htdocs
536
     set_completion_param "ghost domain" "$GHOST_DOMAIN_NAME"
539
     set_completion_param "ghost domain" "$GHOST_DOMAIN_NAME"
537
     if ! grep -q "ghost version:" ${COMPLETION_FILE}; then
540
     if ! grep -q "ghost version:" ${COMPLETION_FILE}; then