Browse Source

Install web server before scuttlebot on mesh image

Bob Mottram 8 years ago
parent
commit
592d0f8d68
2 changed files with 4 additions and 2 deletions
  1. 3
    1
      src/freedombone-app-scuttlebot
  2. 1
    1
      src/freedombone-image-customise

+ 3
- 1
src/freedombone-app-scuttlebot View File

336
         echo '  }' >> $git_ssb_nginx_site
336
         echo '  }' >> $git_ssb_nginx_site
337
         echo '}' >> $git_ssb_nginx_site
337
         echo '}' >> $git_ssb_nginx_site
338
     fi
338
     fi
339
-    nginx_ensite git_ssb
339
+    if [[ "$1" != "mesh" ]]; then
340
+        nginx_ensite git_ssb
341
+    fi
340
 }
342
 }
341
 
343
 
342
 function mesh_install_scuttlebot {
344
 function mesh_install_scuttlebot {

+ 1
- 1
src/freedombone-image-customise View File

698
     #install_tahoelafs
698
     #install_tahoelafs
699
     #install_librevault
699
     #install_librevault
700
     install_patchwork
700
     install_patchwork
701
+    install_web_server
701
     mesh_install_scuttlebot
702
     mesh_install_scuttlebot
702
     #install_ferment
703
     #install_ferment
703
     install_ipfs
704
     install_ipfs
704
     install_tox
705
     install_tox
705
-    install_web_server
706
     install_pelican
706
     install_pelican
707
     mesh_install_cryptpad
707
     mesh_install_cryptpad
708
     #mesh_install_peertube
708
     #mesh_install_peertube