free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Bob Mottram 2017-08-01 10:12:04 +01:00
parent 70295790a0 da30734ba9
commit 962cb6cf13
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-app-cryptpad
View File

@ -37,7 +37,7 @@ SHOW_ICANN_ADDRESS_ON_ABOUT=0
CRYPTPAD_ONION_PORT=8119 CRYPTPAD_ONION_PORT=8119
CRYPTPAD_PORT=9003 CRYPTPAD_PORT=9003
CRYPTPAD_REPO="https://github.com/xwiki-labs/cryptpad" CRYPTPAD_REPO="https://github.com/xwiki-labs/cryptpad"
CRYPTPAD_COMMIT='76e69f0ba85b0e3e21cad2c3eb0012c2429d4bb8' CRYPTPAD_COMMIT='0b69973c179efc6f770a1127f07f67de3d6724d1'
CRYPTPAD_DIR=/etc/cryptpad CRYPTPAD_DIR=/etc/cryptpad
cryptpad_variables=(ONION_ONLY) cryptpad_variables=(ONION_ONLY)

14
src/freedombone-app-ghost
View File

@ -46,6 +46,12 @@ ghost_variables=(GHOST_DOMAIN_NAME
DDNS_PROVIDER DDNS_PROVIDER
MY_USERNAME) MY_USERNAME)
function ghost_bust {
# kill the started ghost process
kill_pid=$(ps aux | grep "ghost run" | awk -F ' ' '{print $2}' | head -n 1)
kill $kill_pid
}
function logging_on_ghost { function logging_on_ghost {
echo -n '' echo -n ''
} }
@ -182,10 +188,14 @@ function upgrade_ghost {
if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then if [ ! -d /var/www/$GHOST_DOMAIN_NAME/htdocs ]; then
return return
fi fi
systemctl stop ghost
cd /var/www/$GHOST_DOMAIN_NAME/htdocs cd /var/www/$GHOST_DOMAIN_NAME/htdocs
npm i -g ghost-cli npm i -g ghost-cli
/usr/local/bin/ghost update /usr/local/bin/ghost update
ghost_bust
ghost_replace_services ghost_replace_services
ghost_remove_offsite_links ghost_remove_offsite_links
@ -395,9 +405,7 @@ function install_ghost {
ghost install local --port ${GHOST_PORT} ghost install local --port ${GHOST_PORT}
# kill the started ghost process ghost_bust
kill_pid=$(ps aux | grep "ghost run" | awk -F ' ' '{print $2}' | head -n 1)
kill $kill_pid
# NOTE: this has to be http, not https # NOTE: this has to be http, not https
sed -i "s|\"url\":|\"url\": \"http://${GHOST_DOMAIN_NAME}/\",|g" /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json sed -i "s|\"url\":|\"url\": \"http://${GHOST_DOMAIN_NAME}/\",|g" /var/www/${GHOST_DOMAIN_NAME}/htdocs/config.development.json