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

RewriteLock support #1228

Merged
merged 2 commits into from Oct 19, 2015
Merged

RewriteLock support #1228

merged 2 commits into from Oct 19, 2015

Conversation

wickedOne
Copy link
Contributor

as addition to the RewriteMap feature i've added the option to define a RewriteLock for apache version <= 2.2 which is considered best practice when using a RewriteMap of type prg

added ability to define a RewriteLock file in the httpd.conf for apache version 2.2
@igalic
Copy link
Contributor

igalic commented Oct 16, 2015

Thanks for catching this oversight! would you mind also adding a test and a doc entry?

@wickedOne
Copy link
Contributor Author

done…

@@ -55,6 +55,7 @@
$conf_template = $::apache::params::conf_template,
$servername = $::apache::params::servername,
$pidfile = $::apache::params::pidfile,
$rewrite_lock = false,
Copy link
Contributor

Choose a reason for hiding this comment

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

let's make this undef by default, since we're dealing with a String (path) here.

@igalic
Copy link
Contributor

igalic commented Oct 17, 2015

looks very good otherwise, thanks @wickedOne!

@wickedOne
Copy link
Contributor Author

thanks for pointing all that out @igalic
made changes accordingly and ammended them to my last commit.

moved the lockfile to location /var/lock/subsys/rewrite-lock in spec/classes/apache_spec.rb as i wasn't able to find something of a best practice for this specific lockfile and as that's where the other lockfiles are stored… hope that's ok with you

igalic added a commit that referenced this pull request Oct 19, 2015
@igalic igalic merged commit f515778 into puppetlabs:master Oct 19, 2015
@igalic
Copy link
Contributor

igalic commented Oct 19, 2015

\o/ @wickedOne!

@wickedOne wickedOne deleted the rewritelock branch October 19, 2015 16:37
@wickedOne
Copy link
Contributor Author

thanx @igalic for the super quick merge! ,,/.

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

3 participants