From 8bc87ee656381a94cf580be16d4a33183fe1b8ce Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 26 Dec 2018 23:05:01 -0500 Subject: [PATCH] feat: always overwrite the dokku.conf file for nginx This is necessary as sometimes older config is shipped with Dokku, meaning that security directives - amongst others - are not properly updated. Refs #3342 --- plugins/nginx-vhosts/install | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index d5b3643f6..c587c6dd6 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -34,11 +34,9 @@ if [[ ! -f /etc/nginx/dhparam.pem ]]; then chown root:root /etc/nginx/dhparam.pem fi -# if dokku.conf has not been created, create it -if [[ ! -f /etc/nginx/conf.d/dokku.conf ]]; then - mkdir -p /etc/nginx/conf.d - chown root:root /etc/nginx/conf.d - cat< /etc/nginx/conf.d/dokku.conf +mkdir -p /etc/nginx/conf.d +chown root:root /etc/nginx/conf.d +cat< /etc/nginx/conf.d/dokku.conf include $DOKKU_ROOT/*/nginx.conf; server_tokens off; @@ -52,7 +50,6 @@ ssl_dhparam /etc/nginx/dhparam.pem; ssl_ciphers ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:RSA+AESGCM:RSA+AES:!aNULL:!MD5:!DSS; EOF -fi # allow users to override their server_names_hash_bucket_size if [[ ! -f /etc/nginx/conf.d/server_names_hash_bucket_size.conf ]]; then