Mathieu Bornoz
9c4e1e2ffb
Sort sub hash keys to have a stable ordering
2014-12-17 09:20:24 +01:00
Carl P. Corliss
7be12d0870
new raw_prepend / raw_append feature for vhosts & locations
...
- 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
2014-06-26 00:00:37 -04:00
Kalman Olah
12d515f7f7
Use first server name for non-www redirects to prevent issues with naming of vhosts within defined types.
...
Signed-off-by: Kalman Olah <kalman@inuits.eu>
2014-06-24 19:22:43 +02:00
Carl P. Corliss
9519298aba
use return instead of rewrite for simple redirects (e.g., www -> naked domain)
2014-06-23 11:46:43 -04:00
eSe
0ade406a89
Remove Arrays as keys in templates
2014-03-11 17:24:30 +01:00
eSe
3ef66c6f63
Fix formatting errors
2014-03-10 10:26:35 +01:00
Daniel Black
4f8096c52c
Extend hash based host_cfg_{ssl_,}{prepend,append} to vhost_{ssl_,}{header,footer}. fix vhost_location_alias/vhost_location_directory. Add {location_custom_cfg_prepend,append} to vhost_location_fastcgi, vhost_location_proxy and vhost_location_stub_status.
2014-03-08 12:16:07 +11:00
Daniel Black
a66cd98ea9
Merge https://github.com/ese/puppet-nginx into hash
...
Resolved Conflicts:
spec/defines/resource_location_spec.rb
templates/vhost/vhost_location_alias.erb
templates/vhost/vhost_location_directory.erb
templates/vhost/vhost_location_empty.erb
templates/vhost/vhost_location_fastcgi.erb
templates/vhost/vhost_location_proxy.erb
templates/vhost/vhost_location_stub_status.erb
2014-03-08 01:20:58 +11:00
Daniel Black
04e34dce39
Key value parameter maps to take array as value
...
Allow arrays to be specified as values in location_cfg_{prepend,append} and
vhost_cfg_{ssl_,}{prepend,append} parameters.
2014-03-07 23:53:32 +11:00
Alan Pearce
05c260a963
Fix deprecated variable access warning in vhost footer template
2013-09-13 15:29:50 +01:00
Joshua Hoblitt
df4243491e
sort $vhost_cfg_append hash in vhost_footer.erb template
...
This is so the paremter ordering in the configuration is stable. It also
force the :allow key (if it exists) to be first in the sort ordering.
It would probably be better to change `$vhost_cfg_append` into an array
of one key hashes but would require a public API change.
2013-08-28 10:14:13 -07:00
Lebedev Vadim
1efc72b53a
* Bug fix, remove each_line method
2013-08-23 12:58:43 +04:00
Abdoul Bah
90c5b7349e
Update vhost_footer.erb
2013-08-15 18:50:20 +02:00
Abdoul Bah
1f007e3587
add listen_port on rewrite_www_to_non_www
...
Adding the port in case it is not by default.
2013-08-15 17:04:36 +02:00
Arthur Leonard Andersen
0191a2fe28
Fix deprecated variable names
2013-07-17 20:42:57 +02:00
Lebedev Vadim
413271f84d
* Fixed log name in template vhost_ssl_header
...
* Better formatting for vhost_autogen.conf
2013-07-08 18:58:05 +04:00
Lebedev Vadim
8d33fd63f1
Merge branch 'master' of https://github.com/jfryman/puppet-nginx
...
Conflicts:
manifests/config.pp
manifests/init.pp
manifests/params.pp
manifests/resource/location.pp
manifests/resource/vhost.pp
manifests/service.pp
templates/vhost/vhost_footer.erb
templates/vhost/vhost_header.erb
templates/vhost/vhost_location_directory.erb
templates/vhost/vhost_location_proxy.erb
templates/vhost/vhost_ssl_header.erb
tests/vhost.pp
2013-05-21 16:30:21 +04:00
Lebedev Vadim
4f0c311901
* Fixed listen parameter in template vhost_ssl_header
...
* Added auth basic support
* Added vhost_cfg_append parameter to `nginx::resource::vhost`
2013-05-20 18:30:32 +04:00
Arne Hingst
921d7f7d57
ability to add include statements for static config files fro ghosts
2013-05-13 10:57:58 +02:00
drdla
cc4b9615f7
Update templates/vhost/vhost_footer.erb
2012-09-01 18:52:55 +03:00
James Fryman
ebd481d570
Added SuSE Support
2011-06-06 17:25:04 -05:00
