From 55ef891d9dac2ab56eb402479e1a62fbd5f9691e Mon Sep 17 00:00:00 2001 From: Jeff Lindsay Date: Thu, 13 Jun 2013 21:58:58 -0700 Subject: [PATCH] probably makes more sense to have this in the makefile --- Makefile | 1 + bootstrap.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2800f8254..d48b3f350 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ install: submodule gitreceive sshcommand cp buildstep/buildstep /home/git/buildstep cp nginx-app-conf /home/git/nginx-app-conf cp nginx-reloader.conf /etc/init/nginx-reloader.conf + echo "include /home/git/*/nginx.conf;" > /etc/nginx/conf.d/dokku.conf submodule: git submodule init diff --git a/bootstrap.sh b/bootstrap.sh index 6b8201b3b..8d7d578ca 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -8,7 +8,6 @@ cd ~ && git clone ${DOKKU_REPO} cd dokku && make install cd buildstep && make build -echo "include /home/git/*/nginx.conf;" > /etc/nginx/conf.d/dokku.conf /etc/init.d/nginx start start nginx-reloader