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

Support itk with mod php #808

Merged
merged 1 commit into from
Aug 6, 2014
Merged

Conversation

corvus-ch
Copy link
Contributor

We have the company policy to use itk on all our production php installations. The restriction to mpm prefork renders the Puppetlabs apache module unusable for our cause.

I extended the integrity checks in mod::php so it also can be used with itk.

@igalic
Copy link
Contributor

igalic commented Aug 6, 2014

looks good, I'd like to see travis actually pass, which now that master is fixed it should

@corvus-ch
Copy link
Contributor Author

Is there some action required to retrigger Travis or will that happen anyway?

@hunner
Copy link
Contributor

hunner commented Aug 6, 2014

If you do git rebase master && git push --force it should re-trigger travis.

@hunner
Copy link
Contributor

hunner commented Aug 6, 2014

Err, that won't work since you sent from your master branch. Fetch the puppetlabs remote and rebase your local branch onto that.

@underscorgan
Copy link
Contributor

@corvus-ch Can you update spec/classes/mod/php_spec.rb with a case with itk enabled instead of prefork?

@corvus-ch
Copy link
Contributor Author

Sure, I can. I do not know systems other than the Debian. So the test for FreeBSD and RedHat is best guess from what was there.

@underscorgan
Copy link
Contributor

@corvus-ch those tests look good, but could you rebase and squash down to a single commit? Thanks!

underscorgan pushed a commit that referenced this pull request Aug 6, 2014
Support itk with mod php
@underscorgan underscorgan merged commit 328cbf8 into puppetlabs:master Aug 6, 2014
@underscorgan
Copy link
Contributor

@corvus-ch thanks for the contribution!

@corvus-ch
Copy link
Contributor Author

@mhaskel Thanks for accepting it. I am glad that I could be of help.

traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
…move_compatible_code

(GH-iac-334) Remove code specific to unsupported OSs
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

5 participants