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

Add vhost Alias and Directory declarations #212

Merged
merged 23 commits into from
Jun 10, 2013
Merged

Conversation

Aethylred
Copy link
Contributor

Sets up Alias declarations from a list of hashes.

Also sets up <Directory></Directory> blocks from a list of hashes.

@Aethylred
Copy link
Contributor Author

Here's an example of this feature being used: https://github.com/nesi/puppet-gold/blob/master/manifests/install.pp#L219

@Aethylred
Copy link
Contributor Author

Ok, I've added tests for Alias directives and Directory blocks (singular and multiple). Because I've substituted the default Directory block, many of the parameters have already been tested.

@hunner
Copy link
Contributor

hunner commented Jun 10, 2013

This is sweethotness :). Thanks for working on this! And adding tests, and using the $_* pattern, and preserving defaults, and documenting your new parameters, and having it pass lint!

hunner added a commit that referenced this pull request Jun 10, 2013
Add vhost Alias and Directory declarations
@hunner hunner merged commit bcb7dc6 into puppetlabs:master Jun 10, 2013
@hunner
Copy link
Contributor

hunner commented Jun 10, 2013

Hmm. I'd love for this to be implemented as apache::vhost::alias and apache::vhost::directory defines... then we could also add things like apache::vhost::rewrite as per #187

@Aethylred
Copy link
Contributor Author

Yes, I did think at the end that having these as defined resources would be better, but this works, and provides a model for the resources to follow. (and I need to get a better handle on virtual and exported resources...)

@Aethylred Aethylred deleted the vhost_alias branch June 10, 2013 23:19
@hunner
Copy link
Contributor

hunner commented Jun 19, 2013

@Aethylred Is there a reason that path is a hash element instead of being a key to a hash? I don't think it's legal to have two <Directory> statements with the same directory-path.

@Aethylred
Copy link
Contributor Author

hmm... so directories = { '/path/to/directory' => { ...hash of attributes }, }

No reason other than I've used lists longer than hashes.

@hunner
Copy link
Contributor

hunner commented Jun 19, 2013

Okay, thanks. Since this will make it into the 1.0.0 release I was just thinking about how I want the API to look.

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.

4 participants