From e2135a2c5f599184ce1f40beb21fccb9a0f8b8de Mon Sep 17 00:00:00 2001 From: Stafford Brunk Date: Tue, 8 Apr 2014 06:48:50 -0600 Subject: [PATCH] Change cert folder name from ssl to tls --- README.md | 8 ++++---- plugins/nginx-vhosts/install | 4 ++-- plugins/nginx-vhosts/post-deploy | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 31f26ce95..81c941d61 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ Dokku provides easy TLS/SPDY support out of the box. This can be done app-by-app ### Per App -To enable TLS connection to to one of your applications, copy or symlink the `.crt`/`.pem` and `.key` files into the application's `/home/dokku/:app/ssl` folder (create this folder if it doesn't exist) as `server.crt` and `server.key` respectively. +To enable TLS connection to to one of your applications, copy or symlink the `.crt`/`.pem` and `.key` files into the application's `/home/dokku/:app/tls` folder (create this folder if it doesn't exist) as `server.crt` and `server.key` respectively. Redeployment of the application will be needed to apply TLS configuration. Once it is redeployed, the application will be accessible by `https://` (redirection from `http://` is applied as well). @@ -118,10 +118,10 @@ Redeployment of the application will be needed to apply TLS configuration. Once To enable TLS connections for all your applications at once you will need a wildcard TLS certificate. -To enable TLS across all apps, copy or symlink the `.crt`/`.pem` and `.key` files into the `/home/dokku/ssl` folder (create this folder if it doesn't exist) as `server.crt` and `server.key` respectively. Then, enable the certificates by editing `/etc/nginx/conf.d/dokku.conf` and uncommenting these two lines (remove the #): +To enable TLS across all apps, copy or symlink the `.crt`/`.pem` and `.key` files into the `/home/dokku/tls` folder (create this folder if it doesn't exist) as `server.crt` and `server.key` respectively. Then, enable the certificates by editing `/etc/nginx/conf.d/dokku.conf` and uncommenting these two lines (remove the #): - ssl_certificate /home/dokku/ssl/server.crt; - ssl_certificate_key /home/dokku/ssl/server.key; + ssl_certificate /home/dokku/tls/server.crt; + ssl_certificate_key /home/dokku/tls/server.key; The nginx configuration will need to be reloaded in order for the updated TLS configuration to be applied. This can be done either via the init system or by re-deploying the application. Once TLS is enabled, the application will be accessible by `https://` (redirection from `http://` is applied as well). diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index 3d4f91d05..d21bdeac5 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -24,8 +24,8 @@ ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-RC4-SHA:ECDHE-RSA-AES128-SHA:A ssl_protocols TLSv1.2 TLSv1.1 TLSv1; ssl_prefer_server_ciphers on; -#ssl_certificate $DOKKU_ROOT/ssl/server.crt; -#ssl_certificate_key $DOKKU_ROOT/ssl/server.key; +#ssl_certificate $DOKKU_ROOT/tls/server.crt; +#ssl_certificate_key $DOKKU_ROOT/tls/server.key; EOF sed -i 's/# server_names_hash_bucket_size/server_names_hash_bucket_size/' /etc/nginx/nginx.conf diff --git a/plugins/nginx-vhosts/post-deploy b/plugins/nginx-vhosts/post-deploy index b2eed1376..be7fd2007 100755 --- a/plugins/nginx-vhosts/post-deploy +++ b/plugins/nginx-vhosts/post-deploy @@ -1,8 +1,8 @@ #!/usr/bin/env bash set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x APP="$1"; PORT="$2" -WILDCARD_SSL="$DOKKU_ROOT/ssl" -SSL="$DOKKU_ROOT/$APP/ssl" +WILDCARD_SSL="$DOKKU_ROOT/tls" +SSL="$DOKKU_ROOT/$APP/tls" if [[ -f "$DOKKU_ROOT/VHOST" ]]; then VHOST=$(< "$DOKKU_ROOT/VHOST")