diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
| commit | 8748f432cdb01090767001523496f096345a492b (patch) | |
| tree | cba4fd0d8d4501424c7fb5e84ba37dc2cdd7fca4 /puppet/templates/etc/nginx/domain.erb | |
| parent | 506b62a99e35c69354e8bc977780e41117f1e6ca (diff) | |
| parent | 5512c493e13998d4c83d7eab3d89e5a1c0836566 (diff) | |
| download | debian-8748f432cdb01090767001523496f096345a492b.tar.gz debian-8748f432cdb01090767001523496f096345a492b.tar.bz2 | |
Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop
Conflicts:
puppet/puppet.conf
Diffstat (limited to 'puppet/templates/etc/nginx/domain.erb')
| -rw-r--r-- | puppet/templates/etc/nginx/domain.erb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/templates/etc/nginx/domain.erb b/puppet/templates/etc/nginx/domain.erb index 4e9fa7d..8beff14 100644 --- a/puppet/templates/etc/nginx/domain.erb +++ b/puppet/templates/etc/nginx/domain.erb @@ -111,6 +111,7 @@ server { ssl_protocols SSLv3 TLSv1; ssl_ciphers HIGH:MEDIUM:!aNULL:!SSLv2:!MD5:@STRENGTH; ssl_prefer_server_ciphers on; + ssl_dhparam /etc/ssl/dhparams/dhparams_2048.pem; # Set the max size for file uploads client_max_body_size 100M; |