-
-
Couldn't load subscription status.
- Fork 871
Add raw_ssl_append and raw_ssl_prepend #1361
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -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 | ||||||
|
|
@@ -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", | ||||||
| Optional[String] $uwsgi_read_timeout = undef, | ||||||
| Array $index_files = [ | ||||||
| 'index.html', | ||||||
|
|
@@ -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, | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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_append = undef, | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| Optional[Variant[Array[String], String]] $location_raw_prepend = undef, | ||||||
| Optional[Variant[Array[String], String]] $location_raw_append = undef, | ||||||
| Optional[Hash] $server_cfg_prepend = undef, | ||||||
|
|
@@ -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') | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -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, | ||||||
|
|
@@ -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, | ||||||
|
|
||||||
There was a problem hiding this comment.
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?