Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add raw_ssl_append and raw_ssl_prepend #1361

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions manifests/resource/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@
# directives). NOTE: YOU are responsible for a semicolon on each line that requires one.
# [*raw_append*] - A single string, or an array of strings to append to the server directive (after cfg append
# directives). NOTE: YOU are responsible for a semicolon on each line that requires one.
# [*raw_ssl_prepend*] - A single string, or an array of strings to prepend to the server ssl directive (after cfg prepend
# directives). NOTE: YOU are responsible for a semicolon on each line that requires one.
# [*raw_ssl_append*] - A single string, or an array of strings to append to the server ssl directive (after cfg append
# directives). NOTE: YOU are responsible for a semicolon on each line that requires one.
# [*location_raw_prepend*] - A single string, or an array of strings to prepend to the location directive (after custom_cfg
# directives). NOTE: YOU are responsible for a semicolon on each line that requires one.
# [*location_raw_append*] - A single string, or an array of strings to append to the location directive (after custom_cfg
Expand Down Expand Up @@ -222,7 +226,8 @@
String $fastcgi_params = "${nginx::conf_dir}/fastcgi.conf",
Optional[String] $fastcgi_script = undef,
Optional[String] $uwsgi = undef,
String $uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
String $uwsgi_params = "${nginx::config::conf_dir}
/uwsgi_params",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you add a newline here? Was this intentional?

Optional[String] $uwsgi_read_timeout = undef,
Array $index_files = [
'index.html',
Expand Down Expand Up @@ -251,6 +256,8 @@
$client_max_body_size = undef,
Optional[Variant[Array[String], String]] $raw_prepend = undef,
Optional[Variant[Array[String], String]] $raw_append = undef,
Optional[Variant[Array[String], String]] $raw_ssl_prepend = undef,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you enforce the minimal string length? I think empty strings don't make sense here:

Suggested change
Optional[Variant[Array[String], String]] $raw_ssl_prepend = undef,
Optional[Variant[Array[String[1]], String[1]]] $raw_ssl_prepend = undef,

Optional[Variant[Array[String], String]] $raw_ssl_append = undef,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Optional[Variant[Array[String], String]] $raw_ssl_append = undef,
Optional[Variant[Array[String[1]], String[1]]] $raw_ssl_append = undef,

Optional[Variant[Array[String], String]] $location_raw_prepend = undef,
Optional[Variant[Array[String], String]] $location_raw_append = undef,
Optional[Hash] $server_cfg_prepend = undef,
Expand Down Expand Up @@ -282,7 +289,7 @@
Hash $locations_defaults = {},
) {

if ! defined(Class['nginx']) {
if !defined(Class['nginx']) {
fail('You must include the nginx base class before using any defined resources')
}

Expand Down Expand Up @@ -365,7 +372,7 @@
# ssl redirect and no ssl -> false
if (!$ssl_redirect or $ssl) and $use_default_location {
# Create the default location reference for the server
nginx::resource::location {"${name_sanitized}-default":
nginx::resource::location { "${name_sanitized}-default":
ensure => $ensure,
server => $name_sanitized,
ssl => $ssl,
Expand Down Expand Up @@ -476,7 +483,7 @@
}

unless $nginx::confd_only {
file{ "${name_sanitized}.conf symlink":
file { "${name_sanitized}.conf symlink":
ensure => $server_symlink_ensure,
path => "${server_enable_dir}/${name_sanitized}.conf",
target => $config_file,
Expand Down
20 changes: 20 additions & 0 deletions spec/defines/resource_server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,16 @@
],
match: %r{^\s+if \(a\) \{\n\s++b;\n\s+\}}
},
{
title: 'should contain raw_ssl_prepend directives',
attr: 'raw_ssl_prepend',
value: [
'if (a) {',
' b;',
'}'
],
match: %r{^\s+if \(a\) \{\n\s++b;\n\s+\}}
},
{
title: 'should contain ordered prepend directives',
attr: 'server_cfg_prepend',
Expand Down Expand Up @@ -1091,6 +1101,16 @@
],
match: %r{^\s+if \(a\) \{\n\s++b;\n\s+\}}
},
{
title: 'should contain raw_ssl_append directives',
attr: 'raw_ssl_append',
value: [
'if (a) {',
' b;',
'}'
],
match: %r{^\s+if \(a\) \{\n\s++b;\n\s+\}}
},
{
title: 'should contain ordered ssl appended directives',
attr: 'server_cfg_ssl_append',
Expand Down
3 changes: 3 additions & 0 deletions templates/server/server_ssl_footer.erb
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,7 @@
<% Array(@raw_append).each do |line| -%>
<%= line %>
<% end -%>
<% Array(@raw_ssl_append).each do |line| -%>
<%= line %>
<% end -%>
}
3 changes: 3 additions & 0 deletions templates/server/server_ssl_header.erb
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@ server {
<% Array(@raw_prepend).each do |line| -%>
<%= line %>
<% end -%>
<% Array(@raw_ssl_prepend).each do |line| -%>
<%= line %>
<% end -%>
<% if @root -%>
root <%= @root %>;
<% end -%>
Expand Down