-
-
Notifications
You must be signed in to change notification settings - Fork 880
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
enhance logging support per location: adding access_log & log_not_found directives #1151
Conversation
While adding this directive can already be added via, e.g.,
|
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.
Thanks for the contributions!
See my comments in review and in PR itself.
I think format_log
and error_log
are also supported?
manifests/resource/location.pp
Outdated
@@ -212,6 +214,8 @@ | |||
Boolean $mp4 = false, | |||
Boolean $flv = false, | |||
Optional[String] $expires = undef, | |||
Optional[Enum['on','off']] $log_not_found = undef, |
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.
Should probably be Optional[Variant[String, Array]]
https://github.com/voxpupuli/puppet-nginx/blob/master/manifests/resource/server.pp#L101-L106
https://github.com/voxpupuli/puppet-nginx/blob/master/templates/server/server_header.erb#L139-L161
Thanks for the contribution! If you need help in terms of adding tests, squashing commits, or have other questions, pop in to #voxpupuli on Freenode IRC or on the Puppet Community Slack. |
…ion: when using it just disable logging, error_log: adding error_level to be able to set a different error level per location if needed); passing off disable the error_log
Requested changes have been done. |
@ceonizm Not sure how easy this will be to fix now, but you need to rebase rather than merge. Why would you not have a valid reason to have multiple access_log directives for a location? One example would be if you're logging to both a local filesystem and to syslog. |
…ror_log to handle multiple declaration
|
…ror_log to handle multiple declaration
…nginx into location_logging
@ceonizm Looks like there's a conflict with something that got merged; can you rebase and squash? |
…ror_log to handle multiple declaration
…ror_log to handle multiple declaration
…nginx into location_logging
@wyardley it should be done (at least I hope so) |
Hi @ceonizm, please take a look at the git history. There are a lot of commits, and I can't cleanly rebase them. Can you please squash them into one commit? Feel freee to reach out to us on IRC if you need any help with git. We're in #voxpupuli on freenode. |
Hi people. I'm going to close this PR due to inactivity. Please reopen and rebase if you're still interested in it. |
As requested in previous PR (#1145) I've splitted features in multiples branches and PR:
Hello,
As I needed to use the access_log and/or log_not_found for some locations on my project I've added it to the module.
Hope it helps
Best regards
François.