issue #101: added ssl configuration
- application folder /ssl is detected and ssl hginx config added - readme corrections
This commit is contained in:
@@ -76,6 +76,10 @@ To setup environment for your application, create file `/home/git/APP_NAME/ENV`.
|
|||||||
|
|
||||||
Next time the application is deployed, those variables would be exposed by `start` script.
|
Next time the application is deployed, those variables would be exposed by `start` script.
|
||||||
|
|
||||||
|
## SSL support
|
||||||
|
|
||||||
|
Dokku provides easy SSL support from the box. To enable SSL connection to your application, copy `.crt` and `.key` file into `/home/git/:app/ssl` folder (notice, file names should be `server.crt` and `server.key`, respectively). Redeployment of application will be needed to apply SSL configuration. Once it redeployed, application will be accessible by `https://` (redirection from `http://` is applied as well).
|
||||||
|
|
||||||
## Advanced installation (for development)
|
## Advanced installation (for development)
|
||||||
|
|
||||||
If you plan on developing dokku, the easiest way to install from your own repository is cloning
|
If you plan on developing dokku, the easiest way to install from your own repository is cloning
|
||||||
@@ -138,7 +142,6 @@ You can use [Github Issues](https://github.com/progrium/dokku/issues), check [Tr
|
|||||||
## Ideas for Improvements
|
## Ideas for Improvements
|
||||||
|
|
||||||
* Custom domain support for apps
|
* Custom domain support for apps
|
||||||
* HTTPS support on default domain
|
|
||||||
* Support more buildpacks (see Buildstep)
|
* Support more buildpacks (see Buildstep)
|
||||||
* Use dokku as the system user instead of git
|
* Use dokku as the system user instead of git
|
||||||
* Heroku-ish commands to be run via SSH (like [Dokuen](https://github.com/peterkeen/dokuen#available-app-sub-commands))
|
* Heroku-ish commands to be run via SSH (like [Dokuen](https://github.com/peterkeen/dokuen#available-app-sub-commands))
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
APP="$1"; PORT="$2"
|
APP="$1"; PORT="$2"
|
||||||
|
SSL="$HOME/$APP/ssl"
|
||||||
if [[ -f "$HOME/VHOST" ]]; then
|
if [[ -f "$HOME/VHOST" ]]; then
|
||||||
VHOST=$(< "$HOME/VHOST")
|
VHOST=$(< "$HOME/VHOST")
|
||||||
SUBDOMAIN=${APP/%\.${VHOST}/}
|
SUBDOMAIN=${APP/%\.${VHOST}/}
|
||||||
@@ -10,20 +10,52 @@ if [[ -f "$HOME/VHOST" ]]; then
|
|||||||
else
|
else
|
||||||
hostname="${APP/\//-}.$VHOST"
|
hostname="${APP/\//-}.$VHOST"
|
||||||
fi
|
fi
|
||||||
cat<<EOF > $HOME/$APP/nginx.conf
|
|
||||||
upstream $APP { server 127.0.0.1:$PORT; }
|
if [[ -f "$SSL/server.crt" ]] && [[ -f "$SSL/server.key" ]]; then
|
||||||
server {
|
CONF='upstream '$APP' { server 127.0.0.1:'$PORT'; }
|
||||||
listen 80;
|
server {
|
||||||
server_name $hostname;
|
listen 80;
|
||||||
location / {
|
server_name '$hostname';
|
||||||
proxy_pass http://$APP;
|
return 301 https://$host$request_uri;
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade \$http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
proxy_set_header Host \$http_host;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
EOF
|
|
||||||
|
server {
|
||||||
|
listen 443;
|
||||||
|
server_name '$hostname';
|
||||||
|
|
||||||
|
ssl on;
|
||||||
|
ssl_certificate '$SSL'/server.crt;
|
||||||
|
ssl_certificate_key '$SSL'/server.key;
|
||||||
|
ssl_ciphers ECDHE-RSA-RC4-SHA;
|
||||||
|
ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://'$APP';
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection "upgrade";
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
|
proxy_set_header X-Scheme $scheme;
|
||||||
|
}
|
||||||
|
}'
|
||||||
|
else
|
||||||
|
CONF='upstream '$APP' { server 127.0.0.1:'$PORT'; }
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name '$hostname';
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://'$APP';
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection "upgrade";
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
|
}
|
||||||
|
}'
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$CONF" > $HOME/$APP/nginx.conf
|
||||||
nc -U $HOME/reload-nginx
|
nc -U $HOME/reload-nginx
|
||||||
echo "$hostname" > "$HOME/$APP/VHOST"
|
echo "$hostname" > "$HOME/$APP/VHOST"
|
||||||
fi
|
fi
|
||||||
Reference in New Issue
Block a user