Skip to content
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

Rework passenger VHost and Directories #1778

Merged

Conversation

smortex
Copy link
Collaborator

@smortex smortex commented Apr 17, 2018

This Pull-Request allow setting all supported parameters to VirtualHosts and Directories.

It also fixes a few things and has a few enhancements:

  • Add types for VHost parameters;
  • Remove deprecated parameters;
  • Reorder parameters to follow the order used in the documentation;
  • Improve unit tests coverage.

The combined commits is a pain to read, but hopefully reviewing commits one by one should be easier :-)

@david22swan
Copy link
Member

Looks fine to me but would like a +1 from someone else

@vidkun
Copy link

vidkun commented Jun 11, 2018

I can't speak to the code quality, but I could really use this capability right now.

@david22swan
Copy link
Member

@hunner Could you give this a quick look please?

@vidkun
Copy link

vidkun commented Jul 12, 2018

Any chance of this getting merged?

@HelenCampbell
Copy link
Contributor

Hey @smortex , I'd be keen to get your changes in, would you have any time to rebase this for us then I can re-review for merge? Thanks!

While here, ensure we have a line-break after PassengerStartupFile.
Follow the Passenger's documentation ordering for parameters:
https://www.phusionpassenger.com/library/config/apache/reference

No functional change.
Without this change, explicitely setting these parameters to 'false'
does the same as not setting the parameters at all.

Since both parameters default to 'Off', this has no direct consequence,
but since we will introduce boolean that defaults to 'On', always output
the parameters with their value when they are set.
RailsBaseURI and RackBaseURI where deprecated in Passenger 3.0.0.
PassengerBaseURI should be used instead.

For some reason, the implementation expected an array, but setting this
parameter with multiple values in a single context does not really make
sense.
A bunch of parameters can be set on a virtual host, but also
directories.  This allows to build complex setups composed of multiple
applications available through a single VirtualHost.
These parameters used to be String (not enforced by types).  In order to
avoid changing the Unit Tests, they were kept as-is.  Now that
refactoring is done, switch to a better type.
@smortex smortex force-pushed the rework-passenger-vhost-and-directories branch from bed0677 to f55a61c Compare July 17, 2018 08:39
@smortex
Copy link
Collaborator Author

smortex commented Jul 17, 2018

Hi @HelenCampbell! I just rebased the branch on top of master. Thanks!

@HelenCampbell
Copy link
Contributor

@smortex Reviewed and ran this PR through an adhoc jenkins pipeline with no issues. I'm happy with the changes so I'll get this merged. Thank you for all the work you put into this!

@HelenCampbell HelenCampbell merged commit 36e5c3d into puppetlabs:master Jul 17, 2018
@smortex smortex deleted the rework-passenger-vhost-and-directories branch February 6, 2019 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants