github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into bootstrap

Browse Source 
Conflicts:
	README.md
This commit is contained in:
Alexander
2013-07-05 07:42:01 +02:00
parent 49f1c444c4 1f45937abc
commit 264d196eee
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -17,7 +17,7 @@ This may take around 5 minutes. Certainly better than the several hours it takes
## Configuring ## 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. 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 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
@@ -72,7 +72,7 @@ apply). Example:
The bootstrap script allows the dokku repository URL to be overridden to bootstrap a host from The bootstrap script allows the dokku repository URL to be overridden to bootstrap a host from
your own clone of dokku using the DOKKU_REPO environment variable. Example: your own clone of dokku using the DOKKU_REPO environment variable. Example:
$ wget -O bootstrap.sh j.mp/dokku-bootstrap $ wget https://raw.github.com/progrium/dokku/master/bootstrap.sh
$ chmod +x bootstrap.sh $ chmod +x bootstrap.sh
$ sudo DOKKU_REPO=https://github.com/yourusername/dokku.git ./bootstrap.sh $ sudo DOKKU_REPO=https://github.com/yourusername/dokku.git ./bootstrap.sh

1
plugins/nginx-vhosts/post-deploy
View File

@@ -14,6 +14,7 @@ server {
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade \$http_upgrade; proxy_set_header Upgrade \$http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_set_header Host \$http_host;
} }
} }
EOF EOF