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

Passenger tuning with the apache::mod::passenger class #146

Merged
merged 4 commits into from
Aug 7, 2013

Conversation

Aethylred
Copy link
Contributor

This patch allows some tuning of Passenger and setting RackBaseURI in the vhost file.

@Aethylred
Copy link
Contributor Author

bother. Includes changes from mod_shib work.

@Aethylred
Copy link
Contributor Author

Rebased! Now just the passenger tuning commits.

@Aethylred
Copy link
Contributor Author

This patch only implements a limited set of the Passenger declarations, but is sufficient to meet the requirements of the puppetmaster under apache::mod::passenger

@sodabrew
Copy link

Hi! We're reviewing this today as part of the Triage-a-Thon, and have a couple of comments:

  • Please rebase once again to master
  • Please squash most/all of the commits together (edit: one commit for this entire PR would be best).
  • Edit: this is not an issue, nevermind Now that Passenger 4.0 is out, we'll need to add some conditionals for parameters that changed between Passenger 3.0 and 4.0. That's not a blocker for this PR, but should be resolved before the next release.

Thank you!

$passenger_max_requests = undef,
$passenger_stat_throttle_rate = undef,
$rack_autodetect = undef,
$rails_autodetect = undef,
Copy link
Contributor

Choose a reason for hiding this comment

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

The equal signs should be aligned.

@Aethylred
Copy link
Contributor Author

Ok, I've got some merges in the branch which are proving to be difficult to squash commits around.

@sodabrew
Copy link

Re: squashing, my advice is to first get your master branch up to date with upstream master, and then do git rebase master on your branch. This should kick out any merges from master and leave just your new code. Then you can git rebase -i master to squash or fixup commits along the way.

@Aethylred
Copy link
Contributor Author

@sodabrew yes, that's what I'm doing, but hitting a lot of conflicts on the way doing the initial git rebase master as this PR dates back to 0.5.0.rc1 or something.

@Aethylred
Copy link
Contributor Author

Ok, I think that's it. Need to try and trigger a Travis run...

@sodabrew
Copy link

Awesome! Travis ran cleanly. Please let me know when you're ready for review and merge.

@Aethylred
Copy link
Contributor Author

Afraid not, I've broken something. Will have to wait until tomorrow, but at least now I just have to look at the diffs between a few commits.

@@ -242,7 +242,6 @@
serveradmin => $serveradmin,
access_log_file => "ssl_${access_log_file}",
priority => '15',
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Accidental deletion?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yup. that was it.

@Aethylred
Copy link
Contributor Author

Bingo.

@sodabrew
Copy link

Awesome! Reviewing now!

@sodabrew
Copy link

👍 @apenney @hunner ping for review and merge.

@blkperl
Copy link
Contributor

blkperl commented Jul 19, 2013

Awesome! You will probably still want to squash this into one commit though. I don't see a reason for multiple commits.

Aaron Hicks added 2 commits July 19, 2013 15:28
@Aethylred
Copy link
Contributor Author

Two should do, one for the functionality, another for the tests.

$rails_autodetect = undef,
$passenger_root = $apache::params::passenger_root,
$passenger_ruby = $apache::params::passenger_ruby,
$passenger_max_pool_size = undef,
) {
apache::mod { 'passenger': }
# Template uses: $passenger_root, $passenger_ruby, $passenger_max_pool_size
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like this line should be updated to include the new variables.

@hunner
Copy link
Contributor

hunner commented Jul 30, 2013

Thanks for your work on this @Aethylred ! Very close to merging :)

hunner added a commit that referenced this pull request Aug 7, 2013
Passenger tuning with the apache::mod::passenger class
@hunner hunner merged commit ca4cd63 into puppetlabs:master Aug 7, 2013
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
Some more of the supported params. Some are still missing where I don't know how they work.
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.

5 participants