opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
541 commits 2 branches 0 tags 1.4 MiB
Commit graph

541 commits

This branch
This branch
All branches
Author SHA1 Message Date
eSe
3ef66c6f63 Fix formatting errors 2014-03-10 10:26:35 +01:00
eSe
dd898c2a0a Fix syntax errors 2014-03-09 20:46:13 +01:00
Daniel Black
36f63ccc16 location_custom_cfg_{prepend,append} for vhost_location_alias 2014-03-08 12:32:40 +11: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
fdc05942f5 vhost_location_directory merge fix - missing end 2014-03-08 01:38:39 +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
eSe
e3f2b804d5 Added tests for hashes as values in location templates 2014-03-06 16:22:30 +01:00
eSe
c07d99c5db Allow values to be hashes at prepend,append,custom cfg for locations 2014-03-05 17:05:46 +01:00
James Fryman
fb560784e8 Merge pull request #265 from huandu/master 
Puppet removes dir only if "force => true"
 2014-03-04 09:03:26 -06:00
Huan Du
eb11249734 puppet removes dir only if "force => true" 2014-03-04 17:03:17 +08:00
James Fryman
7cf6dac978 Merge pull request #259 from pessoa/master 
add location_custom_cfg_prepend support
 2014-02-19 09:51:01 -06:00
pessoa
ca151970e6 add location_custom_cfg_prepend support 2014-02-17 19:51:14 +00:00
James Fryman
e8c1cd70a8 Merge pull request #238 from 3flex/patch-1 
remove changelog
 2014-02-17 13:06:48 -06:00
James Fryman
2caf61ed91 Merge pull request #257 from swanke/master 
Bugfix: Add missing gzip parameter
 2014-02-14 07:03:06 -06:00
Siggi Wanke
559eba3d7b Bugfix: Add missing gzip parameter 2014-02-14 09:47:38 +01:00
James Fryman
7c99c703fa Merge pull request #247 from janorn/master 
Added basic support for nginx on Solaris.
 2014-02-12 10:43:44 -06:00
Jan Örnstedt
7938f05d18 Whitespace fix. 2014-02-12 10:01:22 +01:00
Jan Örnstedt
9bb83dd426 Cut and paste error. Removed debian from solaris case. 2014-02-12 09:19:01 +01:00
James Fryman
047b88d270 Merge pull request #253 from fadenb/bug/missing_allowdeny_vhost_location_proxy 
Allow location_{allow,deny} parameter to be used for proxy locations
 2014-02-11 09:14:18 -06:00
Jan Örnstedt
75d1478b37 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2014-02-11 09:03:34 +01:00
James Fryman
eadc36ce9b Merge pull request #255 from bionix/bugfix_autoindex 
Bugfix autoindex in nginx::resource::vhost
 2014-02-10 12:50:51 -06:00
Markus Rekkenbeil
8cc32d4076 Bugfix: Add missing parameter for location template 2014-02-10 18:45:34 +01:00
Markus Rekkenbeil
971e1a7692 Update vhost_location documentation and template 2014-02-10 18:14:18 +01:00
James Fryman
d2f7f1403d Merge pull request #254 from cdenneen/master 
Added vhost ssl prepend and append
 2014-02-10 09:45:09 -06:00
James Fryman
a2abc95723 Merge pull request #252 from createdbypete/deprecation-notice 
Fix nginx::params deprecation notice
 2014-02-10 09:43:28 -06:00
Chris Denneen
7a83b0ebf2 Merge remote-tracking branch 'origin/patch-1' 
* origin/patch-1:
  Update vhost_ssl_header.erb
 2014-02-07 18:43:41 -05:00
cdenneen
408b0c8b12 Update vhost.pp 2014-02-07 18:40:52 -05:00
cdenneen
41ebc1a659 Update vhost_ssl_footer.erb 2014-02-07 18:37:32 -05:00
cdenneen
4f8c71a5b6 Update vhost_ssl_header.erb 
Add vhost_cfg_prepend to vhost_ssl_header
Add vhost_cfg_ssl_prepend to vhost_ssl_header
 2014-02-07 18:36:30 -05:00
Tristan Helmich
05386c2b74 Allow location_{allow,deny} to be used for proxy locations 2014-02-07 13:44:23 +01:00
Peter Rhoades
4b807acbef Checks $caller_module_name is defined 
[See #240]
 2014-02-06 22:21:19 +00:00
James Fryman
26a856e338 Merge pull request #248 from PierreR/patch-1 
Avoid creating undef variable
 2014-02-06 08:59:19 -06:00
James Fryman
de428893f2 Merge pull request #249 from fadenb/bug/duplicate_listen_option_ipv6only 
Bugfix for duplicate listen option caused by hardcoded `ipv6only=on` in template
 2014-02-04 06:20:57 -08:00
James Fryman
e423db2821 Merge pull request #250 from fadenb/bug/fix_upstream_fail_timeout_spec 
Update test to reflect modified template from #171
 2014-02-04 06:19:28 -08:00
Tristan Helmich
c78ebbfcd2 Update test to reflect modified template from #171 2014-02-03 14:36:06 +01:00
Tristan Helmich
4fb4129aa4 Update tests accroding to changed templates 
Specs no longer require `ipv6only=on` in listen option when using user
supplied value since it is no longer hardcoded in the template.
 2014-02-03 13:13:06 +01:00
Tristan Helmich
15a2695442 Move ipv6only=on option from template into puppet 
See jfryman#30
 2014-02-03 12:54:44 +01:00
Pi3r
27a6fd7532 Avoid creating undef variable 2014-02-01 19:33:49 +01:00
Jan Örnstedt
4a0a857a38 Added basic support for nginx on Solaris. 2014-01-30 16:41:44 +01:00
James Fryman
eeb0830b7f Merge pull request #246 from inflection/add_client_max_body_size 
Adding client_max_body_size.
 2014-01-28 13:08:28 -08:00
James Fryman
8b29715179 Merge pull request #171 from thomasbiddle/upstream_fail_timeout 
Adding upstream fail_timeout.
 2014-01-28 12:57:14 -08:00
TJ Biddle
52b124e505 Adding client_max_body_size. 2014-01-28 12:52:56 -08:00
James Fryman
9b357bcad4 Merge pull request #243 from huandu/master 
Sort @passenger_cgi_param to make sure generated config file content is stable.
 2014-01-24 09:07:24 -08:00
Huan Du
542cbbef2c use stable sort to ensure passenger_set_cgi_param key sequence stable. 2014-01-24 20:25:12 +08:00
James Fryman
d1dc560a37 Merge pull request #233 from abraham1901/dev 
Fixed long names virtual hosts...
 2014-01-23 13:47:04 -08:00
Lebedev Vadim
6997df9d5a Merge branch 'dev' of https://github.com/abraham1901/puppetlabs-nginx into dev 2014-01-21 15:23:06 +04:00
Lebedev Vadim
2252d96fe8 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-21 15:22:19 +04:00
Vadim Lebedev
520b8fe9b4 Merge pull request #1 from 3flex/rspec-tests 
test vhost name is sanitized
 2014-01-18 12:25:48 -08:00
Matthew Haughton
325ae7e6de test vhost name is sanitized 2014-01-18 13:31:05 -05:00