From a0eb48c32b0b39381805aa71a22cbd46aa755fa3 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 2 Jul 2013 10:20:29 -0400 Subject: [PATCH 1/4] ensure that the original http_host gets passed in the proxy to the app --- plugins/nginx-vhosts/post-deploy | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/nginx-vhosts/post-deploy b/plugins/nginx-vhosts/post-deploy index 30b0dfb4a..2b2650369 100755 --- a/plugins/nginx-vhosts/post-deploy +++ b/plugins/nginx-vhosts/post-deploy @@ -14,6 +14,7 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade \$http_upgrade; proxy_set_header Connection "upgrade"; + proxy_set_header Host \$http_host; } } EOF From 30bd933e685d51a75f7be33ab105aa31ebc42516 Mon Sep 17 00:00:00 2001 From: Brandon Evans Date: Tue, 2 Jul 2013 14:21:24 -0600 Subject: [PATCH 2/4] Change filename used in Advanced Installation section of README wget uses the given url to name the downloaded file and doesn't take the redirect into account --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 53c0f1a09..46dca9778 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,9 @@ repositories. The GITRECEIVE_URL and DOKKU_REPO environment variables may be set to override the defaults (see the bootstrap.sh script for how these apply). Example: $ wget j.mp/dokku-bootstrap - $ chmod +x bootstrap.sh - $ sudo DOKKU_REPO=https://github.com/yourusername/dokku.git ./bootstrap.sh - + $ chmod +x dokku-bootstrap + $ sudo DOKKU_REPO=https://github.com/yourusername/dokku.git ./dokku-bootstrap + ## Upgrading Dokku is in active development. You can update the deployment step and the build step separately. From 04e061883330237e30e4fe05c9d2863f261dce70 Mon Sep 17 00:00:00 2001 From: Brandon Evans Date: Tue, 2 Jul 2013 14:32:18 -0600 Subject: [PATCH 3/4] Just use the non-redirected URL instead --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 46dca9778..c8f1fafe2 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,9 @@ The bootstrap script allows source URLs to be overridden to include customizatio repositories. The GITRECEIVE_URL and DOKKU_REPO environment variables may be set to override the defaults (see the bootstrap.sh script for how these apply). Example: - $ wget j.mp/dokku-bootstrap - $ chmod +x dokku-bootstrap - $ sudo DOKKU_REPO=https://github.com/yourusername/dokku.git ./dokku-bootstrap + $ wget https://raw.github.com/progrium/dokku/master/bootstrap.sh + $ chmod +x bootstrap.sh + $ sudo DOKKU_REPO=https://github.com/yourusername/dokku.git ./bootstrap.sh ## Upgrading From bc852395cc0aa59b863a2f8f4b19fbaaf1a5204c Mon Sep 17 00:00:00 2001 From: Emanuele Rocca Date: Thu, 4 Jul 2013 17:01:42 +0200 Subject: [PATCH 4/4] Point to the right conf file for domain name README.md states that the domain name should be set in ~git/DOMAIN. However, ~git/VHOST is the right file for that setting. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 53c0f1a09..7e8510835 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This may take around 5 minutes. Certainly better than the several hours it takes ## Configuring -Set up a domain and a wildcard domain pointing to that host. Make sure `/home/git/DOMAIN` is set to this domain. +Set up a domain and a wildcard domain pointing to that host. Make sure `/home/git/VHOST` is set to this domain. By default it's set to whatever the hostname the host has. You'll have to add a public key associated with a username as it says at the end of the bootstrapper. You'll do something