Skip to content

Correct vhost parameter documentation and run vhost tests on all supported OSes #2257

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

Merged
merged 5 commits into from
Jun 29, 2022

Conversation

ekohl
Copy link
Collaborator

@ekohl ekohl commented Jun 29, 2022

See invididual commits for details. This doesn't modify any code, it's just tests and docs.

ekohl added 5 commits June 29, 2022 14:13
This makes it easier to see if a mod is present.
The previous location was testing it on a vhost that's absent. This is
now testing it on the very complex test where it's present. This is
important because in the future the whole directories concat fragment
isn't rendered on absent vhosts.
This splits off the fastcgi tests to its own case with proper
conditionals. This allows testing the entire define on all supported
operating system versions.

FastCGI is actually unavailable on all supported Debian versions, rather
than just Ubuntu so those are skipped as well.
@ekohl ekohl requested a review from a team as a code owner June 29, 2022 14:07
@puppet-community-rangefinder
Copy link

apache::vhost is a type

Breaking changes to this file WILL impact these 128 modules (exact match):
Breaking changes to this file MAY impact these 35 modules (near match):

This module is declared in 174 of 579 indexed public Puppetfiles.


These results were generated with Rangefinder, a tool that helps predict the downstream impact of breaking changes to elements used in Puppet modules. You can run this on the command line to get a full report.

Exact matches are those that we can positively identify via namespace and the declaring modules' metadata. Non-namespaced items, such as Puppet 3.x functions, will always be reported as near matches only.

Copy link
Member

@david22swan david22swan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@david22swan david22swan merged commit 225e4aa into puppetlabs:main Jun 29, 2022
@ekohl ekohl deleted the clean-up-vhost-tests-and-docs branch June 29, 2022 19:00
end

# this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu
unless facts[:os]['family'] || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Annoyed that I missed this before I merged, but this doesn't look right.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think there is a compare missing from the first part.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes, my bad. That should have been facts[:os]['family'] == 'Debian'. I'm out today and tomorrow so if you haven't fixed it up before Monday I'll submit a patch then.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed: #2258

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants