Pārlūkot izejas kodu

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

Bob Mottram 7 gadus atpakaļ
vecāks
revīzija
962cb6cf13
2 mainītis faili ar 12 papildinājumiem un 4 dzēšanām
  1. 1
    1
      src/freedombone-app-cryptpad
  2. 11
    3
      src/freedombone-app-ghost

+ 1
- 1
src/freedombone-app-cryptpad Parādīt failu

37
 CRYPTPAD_ONION_PORT=8119
37
 CRYPTPAD_ONION_PORT=8119
38
 CRYPTPAD_PORT=9003
38
 CRYPTPAD_PORT=9003
39
 CRYPTPAD_REPO="https://github.com/xwiki-labs/cryptpad"
39
 CRYPTPAD_REPO="https://github.com/xwiki-labs/cryptpad"
40
-CRYPTPAD_COMMIT='76e69f0ba85b0e3e21cad2c3eb0012c2429d4bb8'
40
+CRYPTPAD_COMMIT='0b69973c179efc6f770a1127f07f67de3d6724d1'
41
 CRYPTPAD_DIR=/etc/cryptpad
41
 CRYPTPAD_DIR=/etc/cryptpad
42
 
42
 
43
 cryptpad_variables=(ONION_ONLY)
43
 cryptpad_variables=(ONION_ONLY)

+ 11
- 3
src/freedombone-app-ghost Parādīt failu

46
                  DDNS_PROVIDER
46
                  DDNS_PROVIDER
47
                  MY_USERNAME)
47
                  MY_USERNAME)
48
 
48
 
49
+function ghost_bust {
50
+    # kill the started ghost process
51
+    kill_pid=$(ps aux | grep "ghost run" | awk -F ' ' '{print $2}' | head -n 1)
52
+    kill $kill_pid
53
+}
54
+
49
 function logging_on_ghost {
55
 function logging_on_ghost {
50
     echo -n ''
56
     echo -n ''
51
 }
57
 }
182
     if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then
188
     if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then
183
         return
189
         return
184
     fi
190
     fi
191
+
192
+    systemctl stop ghost
193
+
185
     cd /var/www/$GHOST_DOMAIN_NAME/htdocs
194
     cd /var/www/$GHOST_DOMAIN_NAME/htdocs
186
 
195
 
187
     npm i -g ghost-cli
196
     npm i -g ghost-cli
188
     /usr/local/bin/ghost update
197
     /usr/local/bin/ghost update
198
+    ghost_bust
189
 
199
 
190
     ghost_replace_services
200
     ghost_replace_services
191
     ghost_remove_offsite_links
201
     ghost_remove_offsite_links
395
 
405
 
396
     ghost install local --port ${GHOST_PORT}
406
     ghost install local --port ${GHOST_PORT}
397
 
407
 
398
-    # kill the started ghost process
399
-    kill_pid=$(ps aux | grep "ghost run" | awk -F ' ' '{print $2}' | head -n 1)
400
-    kill $kill_pid
408
+    ghost_bust
401
 
409
 
402
     # NOTE: this has to be http, not https
410
     # NOTE: this has to be http, not https
403
     sed -i "s|\"url\":|\"url\": \"http://${GHOST_DOMAIN_NAME}/\",|g" /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json
411
     sed -i "s|\"url\":|\"url\": \"http://${GHOST_DOMAIN_NAME}/\",|g" /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json