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

(MODULES-2062) updates prefork.conf params for apache 2.4 #1685

Merged
merged 1 commit into from
Sep 25, 2017

Conversation

eputnam
Copy link
Contributor

@eputnam eputnam commented Sep 1, 2017

MaxClients is now MaxRequestWorkers and MaxRequestsPerChild is now MaxConnectionsPerChild. This updates the manifest, template, and adds a couple unit tests. Unit tests for every OS did not seem necessary since all that is being tested is an if block.

MaxClients is now MaxRequestWorkers and MaxRequestsPerChild is now MaxConnectionsPerChild. This updates the manifest, template, and adds a couple unit tests. Unit tests for every OS did not seem necessary since all that is being tested is an if block.
@tphoney
Copy link
Contributor

tphoney commented Sep 25, 2017

Cheers !

@tphoney tphoney merged commit 82ce45d into puppetlabs:master Sep 25, 2017
Copy link
Collaborator

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

I realize it's been merged but I can submit a PR if you agree it should be changed.

@@ -23,6 +25,15 @@
if defined(Class['apache::mod::worker']) {
fail('May not include both apache::mod::prefork and apache::mod::worker on the same node')
}

if versioncmp($_apache_version, '2.3.13') < 0 {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Shouldn't this be >= 0?

<%- if @maxrequestworkers -%>
MaxRequestWorkers <%= @maxrequestworkers %>
<%- elsif @maxclients -%>
MaxClients <%= @maxclients %>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Would you mind keeping the whitespace? That results in a smaller diff on clients.

<%- if @maxconnectionsperchild -%>
MaxConnectionsPerChild <%= @maxconnectionsperchild %>
<%- elsif @maxrequestsperchild -%>
MaxRequestsPerChild <%= @maxrequestsperchild %>
Copy link
Collaborator

Choose a reason for hiding this comment

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

Same here.

cegeka-jenkins pushed a commit to cegeka/puppet-apache that referenced this pull request Jul 15, 2020
(MODULES-2062) updates prefork.conf params for apache 2.4
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