Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/nginx/manifests/init.pp

Issue 29344656: Issue 4078 - Apply Nginx work-around for CVE-2015-4000 (Closed)
Patch Set: Created May 26, 2016, 10:30 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | modules/nginx/templates/site.erb » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/nginx/manifests/init.pp
diff --git a/modules/nginx/manifests/init.pp b/modules/nginx/manifests/init.pp
index 398154e2a6dac7bf00913a4f38b3c554aaf77331..ec164d96627b13b809831163c2fd8d8a83c49d0e 100644
--- a/modules/nginx/manifests/init.pp
+++ b/modules/nginx/manifests/init.pp
@@ -65,6 +65,14 @@ class nginx (
require => Package['nginx'],
}
+ @file {'/etc/nginx/dhparam.pem':
+ ensure => 'present',
+ mode => 0600,
+ notify => Service['nginx'],
+ require => Package['nginx'],
+ source => 'puppet:///modules/private/dhe_rsa_export.pem',
+ }
+
define hostconfig (
$domain = $title,
$alt_names = [],
@@ -85,6 +93,8 @@ class nginx (
}
if $certificate and $private_key {
+ realize(File['/etc/nginx/dhparam.pem'])
+
if !defined(File["/etc/nginx/${certificate}"]) {
file {"/etc/nginx/${certificate}":
ensure => file,
« no previous file with comments | « no previous file | modules/nginx/templates/site.erb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld