Configure nginx and fix startup script to wait for redis

Makefile

-all: database-config resque-yml
+all: database-config resque-yml nginx-conf
 	rm /etc/passwd
 	mv -v /data/etc/passwd /etc/passwd
 	rm /etc/group
@@ -9,18 +9,6 @@ all: database-config resque-yml
 	mv -v /data/etc/gshadow /etc/gshadow
 	groupadd -g 101 git
 	useradd -c "GitLab" -g git -u 101 git
-	rm /etc/passwd-
-	rm /etc/group-
-	rm /etc/shadow-
-	rm /etc/gshadow-
-	mv -v /etc/passwd /data/etc/passwd
-	ln -sv /data/etc/passwd /etc/passwd
-	mv -v /etc/group /data/etc/group
-	ln -sv /data/etc/group /etc/group
-	mv -v /etc/shadow /data/etc/shadow
-	ln -sv /data/etc/shadow /etc/shadow
-	mv -v /etc/gshadow /data/etc/gshadow
-	ln -sv /data/etc/gshadow /etc/gshadow
 
 	dd if=/dev/zero of=swap bs=1048576 count=3072
 	chmod 600 swap
@@ -101,12 +89,27 @@ all: database-config resque-yml
 	sudo -u git /usr/bin/redis-cli shutdown nosave
 
 	install -v -m644 /home/git/gitlab/lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
+	@echo "$$NGINX_CONF" > /etc/nginx/nginx.conf
 	install -v -m644 /home/git/gitlab/lib/support/nginx/gitlab /etc/nginx/gitlab.conf
+	sed -e "s/YOUR_SERVER_FQDN/_/" -i /etc/nginx/gitlab.conf
 	install -v -m755 /home/git/gitlab/lib/support/init.d/gitlab /etc/init.d/gitlab
 	install -v -m644 /home/git/gitlab/lib/support/init.d/gitlab.default.example /etc/default/gitlab
-
+	sed -e "s/redis-server/redis/" -i /etc/init.d/gitlab
 	systemctl enable gitlab.service
 
+	rm /etc/passwd-
+	rm /etc/group-
+	rm /etc/shadow-
+	rm /etc/gshadow-
+	mv -v /etc/passwd /data/etc/passwd
+	ln -sv /data/etc/passwd /etc/passwd
+	mv -v /etc/group /data/etc/group
+	ln -sv /data/etc/group /etc/group
+	mv -v /etc/shadow /data/etc/shadow
+	ln -sv /data/etc/shadow /etc/shadow
+	mv -v /etc/gshadow /data/etc/gshadow
+	ln -sv /data/etc/gshadow /etc/gshadow
+
 	rm -rf /usr/local/share/.yarnrc
 	/bin/sh cleanup gitlab dev doc git tests cache ports man patches node_modules windows macos bytecode maps packed_assets
 
@@ -135,3 +138,23 @@ production:
   url: redis://localhost:6379
 endef
 export RESQUE_YML
+
+nginx-conf:
+define NGINX_CONF
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    sendfile           on;
+    keepalive_timeout  65;
+
+    include /etc/nginx/gitlab.conf;
+}
+endef
+export NGINX_CONF