Skip to content

Commit 96da168

Browse files
committed
nginx: move SSL parameters to a separate file
1 parent 1daab2f commit 96da168

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ RUN apt-get update && \
1212
apt-get install -y openssl && \
1313
rm -rf /var/lib/apt/lists/*
1414

15-
RUN mkdir /etc/nginx/location.d
1615
ADD nginx.conf /etc/nginx/nginx.conf
1716

17+
ADD server.d/ /etc/nginx/server.d/
1818
ADD upstream.d/ /etc/nginx/upstream.d/
1919
ADD location.d/ /etc/nginx/location.d/
2020
ADD upstreams-available/ /etc/nginx/upstreams-available/

nginx.conf

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -47,33 +47,10 @@ http {
4747

4848
server {
4949
listen 8080;
50-
listen 8443 ssl http2;
51-
port_in_redirect off;
52-
53-
# certs sent to the client in SERVER HELLO are concatenated in ssl_certificate
54-
ssl_certificate /etc/ssl/ssl_certificate;
55-
ssl_certificate_key /etc/ssl/ssl_certificate_key;
56-
57-
ssl_session_timeout 1d;
58-
ssl_session_cache shared:SSL:50m;
59-
ssl_session_tickets off;
60-
61-
# Diffie-Hellman parameter for DHE ciphersuites, recommended 2048 bits
62-
ssl_dhparam /etc/ssl/dhparam.pem;
63-
64-
# intermediate configuration. tweak to your needs.
65-
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
66-
ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
67-
ssl_prefer_server_ciphers on;
68-
69-
# OCSP Stapling ---
70-
# fetch OCSP records from URL in ssl_certificate and cache them
71-
ssl_stapling on;
72-
ssl_stapling_verify on;
73-
74-
## verify chain of trust of OCSP response using Root CA and Intermediate certs
75-
#ssl_trusted_certificate /etc/ssl/root_CA_cert_plus_intermediates;
50+
# Also listens on 8443 if certificates are provided:
51+
include /etc/nginx/server.d/*.conf;
7652

53+
port_in_redirect off;
7754

7855
# location.d/api-gateway.conf implements API Gateway for DeviceHive services
7956
include /etc/nginx/location.d/*.conf;

server.d/ssl-parameters.conf

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
listen 8443 ssl http2;
2+
# certs sent to the client in SERVER HELLO are concatenated in ssl_certificate
3+
ssl_certificate /etc/ssl/ssl_certificate;
4+
ssl_certificate_key /etc/ssl/ssl_certificate_key;
5+
6+
ssl_session_timeout 1d;
7+
ssl_session_cache shared:SSL:50m;
8+
ssl_session_tickets off;
9+
10+
# Diffie-Hellman parameter for DHE ciphersuites, recommended 2048 bits
11+
ssl_dhparam /etc/ssl/dhparam.pem;
12+
13+
# intermediate configuration. tweak to your needs.
14+
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
15+
ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
16+
ssl_prefer_server_ciphers on;
17+
18+
# OCSP Stapling ---
19+
# fetch OCSP records from URL in ssl_certificate and cache them
20+
ssl_stapling on;
21+
ssl_stapling_verify on;
22+
23+
## verify chain of trust of OCSP response using Root CA and Intermediate certs
24+
#ssl_trusted_certificate /etc/ssl/root_CA_cert_plus_intermediates;

0 commit comments

Comments
 (0)