Fixed errors and implemented new functions #59
Merged
Conversation
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
Contributor
abraham1901
commented
May 21, 2013
abraham1901
commented
listen_port was being ignore when the template was generated. This commit fixes it.
Try_files is how NGINX files the files to serve particularly in a fallback mode. Using an array for try_files will interate through these options in the generated configuration file.
- Include the port in the listen directive - Add an optional $server_name parameter to nginx::resource::vhost so server_name doesn't have to match the resource's name. This allows the creation of multiple vhosts with the same server_name that listen on different ports.
Support for Scientific Linux
…ort_fix (#11664) Fix listen_port in template so it isn't ignored
Merge upstream
Fix puppet-lint ERROR
Conflicts: manifests/resource/location.pp manifests/resource/vhost.pp
Fix puppet-lint
* Parameter index has now become optional * Fix typos
* Added auth basic support * Added vhost_cfg_append parameter to `nginx::resource::vhost`
Conflicts: manifests/config.pp manifests/init.pp manifests/params.pp manifests/resource/location.pp manifests/resource/vhost.pp manifests/service.pp templates/vhost/vhost_footer.erb templates/vhost/vhost_header.erb templates/vhost/vhost_location_directory.erb templates/vhost/vhost_location_proxy.erb templates/vhost/vhost_ssl_header.erb tests/vhost.pp
| $worker_processes = $nginx::params::nx_worker_processes, | ||
| $worker_connections = $nginx::params::nx_worker_connections, | ||
| $proxy_set_header = $nginx::params::nx_proxy_set_header, | ||
| $proxy_http_version = $nginx::params::nx_proxy_http_version, $confd_purge = $nginx::params::nx_confd_purge, |
There was a problem hiding this comment.
This line looks a bit wonky, can you fix that?
|
Great stuff, thanks! Can you make a few modifications, and I'll merge it in. Thanks! |
|
Sorry. Fixed. |
|
No apologies necessary. Thanks for the code! ❤️ |
jfryman
pushed a commit
that referenced
this pull request
May 21, 2013
Fixed errors and implemented new functions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.