-
-
Notifications
You must be signed in to change notification settings - Fork 881
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
supa-creation
wants to merge
1
commit into
voxpupuli:master
Choose a base branch
from
supa-creation:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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, | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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?