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

new raw_prepend / raw_append feature for vhosts & locations #365

Merged
merged 1 commit into from
Jun 27, 2014

Conversation

rabbitt
Copy link
Contributor

@rabbitt rabbitt commented Jun 26, 2014

  • added raw_prepend / raw_append to vhosts & locations, which
    adds raw lines to the vhost/location /without/ semicolons
  • added location_raw_prepend / location_raw_append to vhost
    for passing through to default location
  • added spec tests for new parameters
  • cleaned up location specs to match new header/body/footer setup
    reducing duplicate checks by testing header/footer separately.
  • cleaned up whitespace (2 space) in touched files
  • used <%- in erb templates to allow the use of leading
    whitespace, making the logic flow more readable
  • Also adds spec tests for recent vhost updates:
    • client_body_timeout
    • client_header_timeout
    • gzip_types
    • testing that the first server_name is used when www_to_non_www is true

note: this essentially takes care of conditionals as mentioned in #267

  - added raw_prepend / raw_append to vhosts & locations, which
    adds raw lines to the vhost/location /without/ semicolons
  - added location_raw_prepend / location_raw_append to vhost
    for passing through to default location
  - added spec tests for new parameters
  - cleaned up location specs to match new header/body/footer setup
    reducing duplicate checks by testing header/footer separately.
  - cleaned up whitespace (2 space) in touched files
  - used `<%-` in erb templates to allow the use of leading
    whitespace, making the logic flow more readable
  - Also adds spec tests for recent vhost updates:
    - client_body_timeout
    - client_header_timeout
    - gzip_types
    - testing that the first server_name is used when www_to_non_www is true
@rabbitt
Copy link
Contributor Author

rabbitt commented Jun 26, 2014

@jfryman P.s., If you'd prefer, I can strip out the extra, non-related, spec tests into a separate PR - I just figured I'd add them while I was already working on the files.

@jfryman
Copy link
Contributor

jfryman commented Jun 27, 2014

WFM. 🤘

jfryman pushed a commit that referenced this pull request Jun 27, 2014
new raw_prepend / raw_append feature for vhosts & locations
@jfryman jfryman merged commit 7490f39 into voxpupuli:master Jun 27, 2014
@cdenneen
Copy link
Contributor

@jfryman Can these be pushed into Forge? I was looking at the location.pp hasn't been updated on forge since March for 0.0.9 push and there have been lots of changes since then.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants