|
34 | 34 | class puppet::passenger(
|
35 | 35 | $generate_ssl_certs = true,
|
36 | 36 | $puppet_passenger_port,
|
| 37 | + $puppet_passenger_ssl_protocol, |
| 38 | + $puppet_passenger_ssl_cipher, |
37 | 39 | $puppet_passenger_tempdir = false,
|
38 | 40 | $puppet_docroot,
|
39 | 41 | $apache_serveradmin,
|
|
48 | 50 | $passenger_max_requests = 0,
|
49 | 51 | $passenger_stat_throttle_rate = 10,
|
50 | 52 | ){
|
51 |
| - include apache |
| 53 | + #include apache |
| 54 | + class { 'apache': |
| 55 | + server_tokens => 'Prod', |
| 56 | + server_signature => 'Off', |
| 57 | + trace_enable => 'Off', |
| 58 | + } ### class |
52 | 59 | include puppet::params
|
53 | 60 | class { 'apache::mod::passenger':
|
54 | 61 | passenger_max_pool_size => $passenger_max_pool_size,
|
55 | 62 | passenger_high_performance => $passenger_high_performance,
|
56 | 63 | passenger_max_requests => $passenger_max_requests,
|
57 | 64 | passenger_stat_throttle_rate => $passenger_stat_throttle_rate,
|
58 | 65 | }
|
59 |
| - include apache::mod::ssl |
| 66 | + #include apache::mod::ssl |
| 67 | + apache::mod::ssl { |
| 68 | + ssl_protocol => [$puppet_passenger_ssl_protocol], |
| 69 | + ssl_cipher => $puppet_passenger_ssl_cipher, |
| 70 | + } ### Apache::Mod::Ssl defaults |
60 | 71 |
|
61 | 72 | if $::osfamily == 'redhat' {
|
62 | 73 | file { '/var/lib/puppet/reports':
|
|
121 | 132 | ssl_chain => "${puppet_ssldir}/ca/ca_crt.pem",
|
122 | 133 | ssl_ca => "${puppet_ssldir}/ca/ca_crt.pem",
|
123 | 134 | ssl_crl => "${puppet_ssldir}/ca/ca_crl.pem",
|
124 |
| - ssl_protocol => 'ALL -SSLv2 -SSLv3', |
125 |
| - ssl_cipher => 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK', |
| 135 | + ssl_protocol => $::puppet::params::ssl_protocol, |
| 136 | + ssl_cipher => $::puppet::params::ssl_cipher, |
126 | 137 | ssl_honorcipherorder => 'On',
|
127 | 138 | ssl_verify_client => 'optional',
|
128 | 139 | ssl_verify_depth => '1',
|
|
0 commit comments