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

re-enable git-ssb setup with paths

This commit is contained in:
Bob Mottram 2018-04-13 20:59:37 +01:00
parent 306766000b
commit 12c0eed38b
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/freedombone-app-scuttlebot
View File

@ -259,14 +259,15 @@ function git_ssb_script {
function scuttlebot_git_setup { function scuttlebot_git_setup {
if [[ "$1" == "mesh" ]]; then if [[ "$1" == "mesh" ]]; then
if [ ! -d "$rootdir/root/.npm-global/lib/node_modules/git-ssb-web/highlight" ]; then
mkdir "$rootdir/root/.npm-global/lib/node_modules/git-ssb-web/highlight" if [ ! -d "$rootdir/root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight" ]; then
mkdir "$rootdir/root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight"
fi fi
if [ ! -f "$rootdir/root/.npm-global/highlight.js/styles/foundation.css" ]; then if [ ! -f "$rootdir/root/.npm-global/lib/node_modules/git-ssb/node_modules/highlight.js/styles/foundation.css" ]; then
echo $'Could not find foundation.css' echo $'Could not find foundation.css'
exit 347687245 exit 347687245
fi fi
cp "$rootdir/root/.npm-global/lib/node_modules/highlight.js/styles/foundation.css" "$rootdir/root/.npm-global/lib/node_modules/git-ssb-web/highlight/foundation.css" cp "$rootdir/root/.npm-global/lib/node_modules/git-ssb/node_modules/highlight.js/styles/foundation.css" "$rootdir/root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight/foundation.css"
git_ssb_nginx_site=$rootdir/etc/nginx/sites-available/git_ssb git_ssb_nginx_site=$rootdir/etc/nginx/sites-available/git_ssb
{ echo 'server {'; { echo 'server {';
@ -284,14 +285,14 @@ function scuttlebot_git_setup {
exit 7357225 exit 7357225
fi fi
if [ ! -d /root/.npm-global/lib/node_modules/git-ssb-web/highlight ]; then if [ ! -d /root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight ]; then
mkdir /root/.npm-global/lib/node_modules/git-ssb-web/highlight mkdir /root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight
fi fi
if [ ! -f /root/.npm-global/lib/node_modules/highlight.js/styles/foundation.css ]; then if [ ! -f /root/.npm-global/lib/node_modules/git-ssb/node_modules/highlight.js/styles/foundation.css ]; then
echo $'Could not find foundation.css' echo $'Could not find foundation.css'
exit 347687245 exit 347687245
fi fi
cp /root/.npm-global/lib/node_modules/highlight.js/styles/foundation.css /root/.npm-global/lib/node_modules/git-ssb-web/highlight/foundation.css cp /root/.npm-global/lib/node_modules/git-ssb/node_modules/highlight.js/styles/foundation.css /root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight/foundation.css
git_ssb_nginx_site=/etc/nginx/sites-available/${SCUTTLEBOT_DOMAIN_NAME} git_ssb_nginx_site=/etc/nginx/sites-available/${SCUTTLEBOT_DOMAIN_NAME}
function_check nginx_http_redirect function_check nginx_http_redirect
@ -313,7 +314,7 @@ function scuttlebot_git_setup {
fi fi
{ echo ''; { echo '';
echo ' root /root/.npm-global/lib/node_modules/git-ssb-web;'; echo ' root /root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web;';
echo ''; echo '';
echo ' location = / {'; echo ' location = / {';
echo " proxy_pass http://localhost:${GIT_SSB_PORT};"; echo " proxy_pass http://localhost:${GIT_SSB_PORT};";
@ -339,7 +340,7 @@ function scuttlebot_git_setup {
echo ' add_header X-Content-Type-Options nosniff;'; echo ' add_header X-Content-Type-Options nosniff;';
echo ' add_header X-Frame-Options SAMEORIGIN;'; echo ' add_header X-Frame-Options SAMEORIGIN;';
echo ''; echo '';
echo ' root /root/.npm-global/lib/node_modules/git-ssb-web;'; echo ' root /root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web;';
echo ''; echo '';
echo ' location = / {'; echo ' location = / {';
echo " proxy_pass http://localhost:${GIT_SSB_PORT};"; echo " proxy_pass http://localhost:${GIT_SSB_PORT};";
@ -443,8 +444,8 @@ EOF
echo '[Install]'; echo '[Install]';
echo 'WantedBy=multi-user.target'; } > "$rootdir/etc/systemd/system/scuttlebot.service" echo 'WantedBy=multi-user.target'; } > "$rootdir/etc/systemd/system/scuttlebot.service"
#scuttlebot_git_setup mesh scuttlebot_git_setup mesh
#git_ssb_script mesh git_ssb_script mesh
} }
function install_scuttlebot { function install_scuttlebot {