Install web server before scuttlebot on mesh image

This commit is contained in:
Bob Mottram 2017-12-16 13:03:32 +00:00
parent 152d3f44d6
commit 592d0f8d68
2 changed files with 4 additions and 2 deletions

View File

@ -336,7 +336,9 @@ function scuttlebot_git_setup {
echo ' }' >> $git_ssb_nginx_site echo ' }' >> $git_ssb_nginx_site
echo '}' >> $git_ssb_nginx_site echo '}' >> $git_ssb_nginx_site
fi fi
nginx_ensite git_ssb if [[ "$1" != "mesh" ]]; then
nginx_ensite git_ssb
fi
} }
function mesh_install_scuttlebot { function mesh_install_scuttlebot {

View File

@ -698,11 +698,11 @@ initialise_mesh() {
#install_tahoelafs #install_tahoelafs
#install_librevault #install_librevault
install_patchwork install_patchwork
install_web_server
mesh_install_scuttlebot mesh_install_scuttlebot
#install_ferment #install_ferment
install_ipfs install_ipfs
install_tox install_tox
install_web_server
install_pelican install_pelican
mesh_install_cryptpad mesh_install_cryptpad
#mesh_install_peertube #mesh_install_peertube