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

added $server_root parameter #443

Merged
merged 1 commit into from
Nov 8, 2013
Merged

Conversation

ptomulik
Copy link
Contributor

@ptomulik ptomulik commented Nov 7, 2013

Previously, the $httpd_dir was used as ServerRoot in httpd.conf
template. On some installations httpd_dir is not same as ServerRoot,
for example on FreeBSD apache22 (installed via ports) has ServerRoot set
to /usr/local by default.

This PR adds $server_root parameter to apache::params. Its purpose is to
be substituted in httpd.conf as ServerRoot. This parameter is used
in #342. The purpose of the whole thing is to plit #342 into smaller
parts to make review process easier, see
#342 (comment)

@apenney
Copy link
Contributor

apenney commented Nov 7, 2013

Do you think this is worth exposing as a parameter? Right now it's just in params.pp and not as an actual param. I don't know if people would generally have cause to change this, but you never know.

@ptomulik
Copy link
Contributor Author

ptomulik commented Nov 8, 2013

I don't know, I've just organized this parameter simillary to $httpd_dir (which was used previously as ServerRoot). I would prefer to leave this as is (less work for me). I think having additional parameter in apache class doesn't hurt (does it?).

@apenney
Copy link
Contributor

apenney commented Nov 8, 2013

Maybe I'm losing my mind but when I look at the diff the problem is that there isn't a parameter in the apache class, there's just an entry in params.pp and no entry in init.pp to match, which is what I meant. I'm fine with it being an additional parameter, which is what I want, it just isn't :) It just needs one extra line :D

Previously, the $httpd_dir was used as ServerRoot in httpd.conf
template. On some installations httpd_dir is not same as ServerRoot,
for example on FreeBSD apache22 (installed via ports) has ServerRoot set
to /usr/local by default.

This PR adds $server_root parameter to apache::params. Its purpose is to
be substituted in httpd.conf as ServerRoot. This parameter is used
in puppetlabs#342. The purpose of the whole thing is to plit puppetlabs#342 into smaller
parts to make review process easier, see
puppetlabs#342 (comment)
@ptomulik
Copy link
Contributor Author

ptomulik commented Nov 8, 2013

OMG, you're right! It must be a result of wild rebasing. It's corrected now.

apenney pushed a commit that referenced this pull request Nov 8, 2013
added $server_root parameter
@apenney apenney merged commit 02e795f into puppetlabs:master Nov 8, 2013
@ptomulik ptomulik deleted the server_root branch November 8, 2013 18:42
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
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.

3 participants