|
@@ -259,14 +259,15 @@ function git_ssb_script {
|
259
|
259
|
|
260
|
260
|
function scuttlebot_git_setup {
|
261
|
261
|
if [[ "$1" == "mesh" ]]; then
|
262
|
|
- if [ ! -d "$rootdir/root/.npm-global/lib/node_modules/git-ssb-web/highlight" ]; then
|
263
|
|
- mkdir "$rootdir/root/.npm-global/lib/node_modules/git-ssb-web/highlight"
|
|
262
|
+
|
|
263
|
+ if [ ! -d "$rootdir/root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight" ]; then
|
|
264
|
+ mkdir "$rootdir/root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight"
|
264
|
265
|
fi
|
265
|
|
- if [ ! -f "$rootdir/root/.npm-global/highlight.js/styles/foundation.css" ]; then
|
|
266
|
+ if [ ! -f "$rootdir/root/.npm-global/lib/node_modules/git-ssb/node_modules/highlight.js/styles/foundation.css" ]; then
|
266
|
267
|
echo $'Could not find foundation.css'
|
267
|
268
|
exit 347687245
|
268
|
269
|
fi
|
269
|
|
- 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"
|
|
270
|
+ 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"
|
270
|
271
|
|
271
|
272
|
git_ssb_nginx_site=$rootdir/etc/nginx/sites-available/git_ssb
|
272
|
273
|
{ echo 'server {';
|
|
@@ -284,14 +285,14 @@ function scuttlebot_git_setup {
|
284
|
285
|
exit 7357225
|
285
|
286
|
fi
|
286
|
287
|
|
287
|
|
- if [ ! -d /root/.npm-global/lib/node_modules/git-ssb-web/highlight ]; then
|
288
|
|
- mkdir /root/.npm-global/lib/node_modules/git-ssb-web/highlight
|
|
288
|
+ if [ ! -d /root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight ]; then
|
|
289
|
+ mkdir /root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web/highlight
|
289
|
290
|
fi
|
290
|
|
- if [ ! -f /root/.npm-global/lib/node_modules/highlight.js/styles/foundation.css ]; then
|
|
291
|
+ if [ ! -f /root/.npm-global/lib/node_modules/git-ssb/node_modules/highlight.js/styles/foundation.css ]; then
|
291
|
292
|
echo $'Could not find foundation.css'
|
292
|
293
|
exit 347687245
|
293
|
294
|
fi
|
294
|
|
- cp /root/.npm-global/lib/node_modules/highlight.js/styles/foundation.css /root/.npm-global/lib/node_modules/git-ssb-web/highlight/foundation.css
|
|
295
|
+ 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
|
295
|
296
|
|
296
|
297
|
git_ssb_nginx_site=/etc/nginx/sites-available/${SCUTTLEBOT_DOMAIN_NAME}
|
297
|
298
|
function_check nginx_http_redirect
|
|
@@ -313,7 +314,7 @@ function scuttlebot_git_setup {
|
313
|
314
|
fi
|
314
|
315
|
|
315
|
316
|
{ echo '';
|
316
|
|
- echo ' root /root/.npm-global/lib/node_modules/git-ssb-web;';
|
|
317
|
+ echo ' root /root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web;';
|
317
|
318
|
echo '';
|
318
|
319
|
echo ' location = / {';
|
319
|
320
|
echo " proxy_pass http://localhost:${GIT_SSB_PORT};";
|
|
@@ -339,7 +340,7 @@ function scuttlebot_git_setup {
|
339
|
340
|
echo ' add_header X-Content-Type-Options nosniff;';
|
340
|
341
|
echo ' add_header X-Frame-Options SAMEORIGIN;';
|
341
|
342
|
echo '';
|
342
|
|
- echo ' root /root/.npm-global/lib/node_modules/git-ssb-web;';
|
|
343
|
+ echo ' root /root/.npm-global/lib/node_modules/git-ssb/node_modules/git-ssb-web;';
|
343
|
344
|
echo '';
|
344
|
345
|
echo ' location = / {';
|
345
|
346
|
echo " proxy_pass http://localhost:${GIT_SSB_PORT};";
|
|
@@ -443,8 +444,8 @@ EOF
|
443
|
444
|
echo '[Install]';
|
444
|
445
|
echo 'WantedBy=multi-user.target'; } > "$rootdir/etc/systemd/system/scuttlebot.service"
|
445
|
446
|
|
446
|
|
- #scuttlebot_git_setup mesh
|
447
|
|
- #git_ssb_script mesh
|
|
447
|
+ scuttlebot_git_setup mesh
|
|
448
|
+ git_ssb_script mesh
|
448
|
449
|
}
|
449
|
450
|
|
450
|
451
|
function install_scuttlebot {
|