Adds ability to detect modified nginx for fact #913
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
bastelfreak
approved these changes
Oct 9, 2016
* For instance openresty: http://openresty.org/en/) is installed. * Openresty can be installed from a package or compiled * This allows it to have two possible paths: nginx or openresty * Fact and spec updated to detect both paths * Regex updated to capture openresty output * Added spec for no nginx or openresty install * Moved spec to correct path (not in util folder) * Added exception for nested examples, as it makes Facter tests easier to read
petems
force-pushed
the
fix_fact_for_openresty_install_and_spec
branch
from
bccbc0b
to
160b6ae
Compare
wyardley
reviewed
Oct 9, 2016
| if Facter.value('kernel') != 'windows' && (Facter::Util::Resolution.which('nginx') || Facter::Util::Resolution.which('openresty')) | ||
| nginx_version_command = Facter::Util::Resolution.which('nginx') ? 'nginx -v 2>&1' : 'openresty -v 2>&1' | ||
| nginx_version = Facter::Util::Resolution.exec(nginx_version_command) | ||
| %r{nginx version: (nginx|openresty)\/([\w\.]+)}.match(nginx_version)[2] |
There was a problem hiding this comment.
Any reason not to just do
%r{nginx version: (?:nginx|openresty)\/([\w\.]+)}.match(nginx_version)[1] here?
Or capture it but create a new fact nginx_flavor or similar?
Merged
Rubueno
pushed a commit
to Rubueno/puppet-nginx
that referenced
this pull request
Oct 19, 2020
…nstall_and_spec Adds ability to detect modified nginx for fact
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.
Rebase and refactor of #890.
Adds ability to detect modified nginx for fact
* For instance openresty: http://openresty.org/en/) is installed.
* Openresty can be installed from a package or compiled
* This allows it to have two possible paths: nginx or openresty
* Fact and spec updated to detect both paths
* Regex updated to capture openresty output
* Added spec for no nginx or openresty install
* Moved spec to correct path (not in util folder)