From 9f3c7ace2dc95ae0279ded1940d5963dccf0e5b6 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 12 Jan 2019 19:50:54 +0100 Subject: move nginx snippets to global files location --- files/common/nginx-snippets/hsts.conf | 1 + files/common/nginx-snippets/proxy-nobuff.conf | 4 ++++ files/common/nginx-snippets/security-headers.conf | 4 ++++ files/common/nginx-snippets/ssl.conf | 10 ++++++++++ roles/elevate/media/files/nginx-snippets/hsts.conf | 1 - roles/elevate/media/files/nginx-snippets/ssl.conf | 10 ---------- roles/elevate/media/tasks/nginx.yml | 2 +- 7 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 files/common/nginx-snippets/hsts.conf create mode 100644 files/common/nginx-snippets/proxy-nobuff.conf create mode 100644 files/common/nginx-snippets/security-headers.conf create mode 100644 files/common/nginx-snippets/ssl.conf delete mode 100644 roles/elevate/media/files/nginx-snippets/hsts.conf delete mode 100644 roles/elevate/media/files/nginx-snippets/ssl.conf diff --git a/files/common/nginx-snippets/hsts.conf b/files/common/nginx-snippets/hsts.conf new file mode 100644 index 00000000..4ca8396e --- /dev/null +++ b/files/common/nginx-snippets/hsts.conf @@ -0,0 +1 @@ +add_header Strict-Transport-Security max-age=15768000; diff --git a/files/common/nginx-snippets/proxy-nobuff.conf b/files/common/nginx-snippets/proxy-nobuff.conf new file mode 100644 index 00000000..b08de70c --- /dev/null +++ b/files/common/nginx-snippets/proxy-nobuff.conf @@ -0,0 +1,4 @@ +proxy_buffering off; +proxy_ignore_headers "X-Accel-Buffering"; +proxy_request_buffering off; +proxy_http_version 1.1; diff --git a/files/common/nginx-snippets/security-headers.conf b/files/common/nginx-snippets/security-headers.conf new file mode 100644 index 00000000..b94d479d --- /dev/null +++ b/files/common/nginx-snippets/security-headers.conf @@ -0,0 +1,4 @@ +add_header X-Frame-Options DENY; +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +# add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self'; script-src 'self'; style-src 'self'"; diff --git a/files/common/nginx-snippets/ssl.conf b/files/common/nginx-snippets/ssl.conf new file mode 100644 index 00000000..d187a7c0 --- /dev/null +++ b/files/common/nginx-snippets/ssl.conf @@ -0,0 +1,10 @@ +ssl_protocols TLSv1 TLSv1.1 TLSv1.2; +ssl_ciphers ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:RSA+AES:!ADH:!AECDH:!MD5; +ssl_prefer_server_ciphers on; + +# openssl dhparam -out /etc/ssl/certs/dhparams.pem 2048 +ssl_dhparam /etc/ssl/dhparams.pem; + +ssl_session_cache shared:SSL:10m; +ssl_session_timeout 10m; +ssl_session_tickets off; diff --git a/roles/elevate/media/files/nginx-snippets/hsts.conf b/roles/elevate/media/files/nginx-snippets/hsts.conf deleted file mode 100644 index 4ca8396e..00000000 --- a/roles/elevate/media/files/nginx-snippets/hsts.conf +++ /dev/null @@ -1 +0,0 @@ -add_header Strict-Transport-Security max-age=15768000; diff --git a/roles/elevate/media/files/nginx-snippets/ssl.conf b/roles/elevate/media/files/nginx-snippets/ssl.conf deleted file mode 100644 index d187a7c0..00000000 --- a/roles/elevate/media/files/nginx-snippets/ssl.conf +++ /dev/null @@ -1,10 +0,0 @@ -ssl_protocols TLSv1 TLSv1.1 TLSv1.2; -ssl_ciphers ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:RSA+AES:!ADH:!AECDH:!MD5; -ssl_prefer_server_ciphers on; - -# openssl dhparam -out /etc/ssl/certs/dhparams.pem 2048 -ssl_dhparam /etc/ssl/dhparams.pem; - -ssl_session_cache shared:SSL:10m; -ssl_session_timeout 10m; -ssl_session_tickets off; diff --git a/roles/elevate/media/tasks/nginx.yml b/roles/elevate/media/tasks/nginx.yml index fd1ed888..2441872a 100644 --- a/roles/elevate/media/tasks/nginx.yml +++ b/roles/elevate/media/tasks/nginx.yml @@ -9,7 +9,7 @@ - name: install nginx config snippets copy: - src: "nginx-snippets/{{ item }}.conf" + src: "{{ global_files_dir }}/common/nginx-snippets/{{ item }}.conf" dest: /etc/nginx/snippets/ with_items: - ssl -- cgit v1.2.3