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

100 commits

Author SHA1 Message Date
Ashley Penney
39bc3f16ac This commit addresses issue #49, the lack of ways to set allow and 
deny rules within a location.
 2013-09-04 13:04:28 -04:00
James Fryman
43d2e86a20 Merge pull request #123 from jhoblitt/sort_vhost_cfg_append 
sort $vhost_cfg_append hash in vhost_footer.erb template
 2013-09-03 08:08:20 -07:00
Theo Spears
2170297c87 Fix typo in vhost_header 2013-08-31 19:09:58 +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
James Fryman
bd57348454 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-08-22 15:44:51 -05:00
James Fryman
e1aa65d20c Manual merge of https://github.com/jfryman/puppet-nginx/pull/100 2013-08-22 15:44:25 -05:00
James Fryman
b246c13285 Merge pull request #104 from stephenrjohnson/vhost_template_cleanup 
fix template, should use @
 2013-08-22 13:39:59 -07:00
Abdoul Bah
b40196f843 Update vhost_location_stub_status.erb 
this does not affect ruby1.9
 2013-08-15 21:08:03 +02:00
Abdoul Bah
e0f2666077 Update vhost_location_proxy.erb 
this does not affect ruby1.9
 2013-08-15 21:07:40 +02:00
Abdoul Bah
81c46e165e Update vhost_location_fastcgi.erb 2013-08-15 21:07:06 +02:00
Abdoul Bah
2915ff22db Update vhost_location_empty.erb 
this does not affect ruby1.9
 2013-08-15 21:06:23 +02:00
Abdoul Bah
e408cdc2f4 Update vhost_location_directory.erb 
this does not affect ruby1.9
 2013-08-15 21:05:38 +02:00
Abdoul Bah
3a2dd716a0 Update vhost_location_alias.erb 
this does not affect ruby1.9
 2013-08-15 21:05:02 +02:00
Abdoul Bah
029e40b836 Update vhost_location_stub_status.erb 2013-08-15 18:57:22 +02:00
Abdoul Bah
be5dd67875 Update vhost_location_proxy.erb 2013-08-15 18:56:58 +02:00
Abdoul Bah
0be9924df5 Update vhost_location_fastcgi.erb 2013-08-15 18:56:05 +02:00
Abdoul Bah
f87d4770df Update vhost_location_empty.erb 2013-08-15 18:55:14 +02:00
Abdoul Bah
d10eaa423a Update vhost_location_directory.erb 2013-08-15 18:54:41 +02:00
Abdoul Bah
939d0bd458 Update vhost_location_alias.erb 2013-08-15 18:53:45 +02:00
Abdoul Bah
b432d5269c Update vhost_header.erb 2013-08-15 18:52:35 +02: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
Stephen
28f9f74c1b Template variables should start with @ 2013-08-05 08:33:36 +01:00
Justice London
6911b91f9e Merge branch 'master' of https://github.com/jfryman/puppet-nginx into jfryman-master 
Conflicts:
	templates/vhost/vhost_location_fastcgi.erb
 2013-08-02 13:07:53 -04:00
Lebedev Vadim
49b5b79b76 * Option fastcgi_script fixed 
* Options location_cfg_append and location_cfg_prepend added to fastcgi template
* Option www_root is optional now
* Options logging fixed in http template
* Auth_basic fixed in SSL vhost header
 2013-08-01 01:07:59 +04:00
Lebedev Vadim
5522f27d9b * Option fastcgi_script fixed 
* Options location_cfg_append and location_cfg_prepend added to fastcgi template
* Option www_root is optional now
* Options logging fixed in http template
 2013-08-01 00:56:32 +04:00
Justice London
30e9773aeb Merge pull request #1 from jfryman/master 
Merging upstream changes
 2013-07-25 09:51:45 -07:00
Lebedev Vadim
ae9303233c Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/init.pp
 2013-07-21 19:40:29 +04:00
Lebedev Vadim
386026fda8 Adding option http_cfg_append to class nginx 
Fix puppet-lint
 2013-07-21 04:12:18 +04:00
Justice London
aeef0711bb Added split file support to location (for fastcgi) 2013-07-19 11:56:03 -04:00
Pan
b6fb7ae54f Fix undefined method `sort_by' error from vhost_location_empty.erb 
In the template, we should check if the variable is defined before use it
 2013-07-18 14:36:56 -07:00
Justice London
acfdf04265 Added try_files to fastcgi 2013-07-17 19:29:49 -04:00
Arthur Leonard Andersen
0191a2fe28 Fix deprecated variable names 2013-07-17 20:42:57 +02:00
James Fryman
fc331e8173 Merge pull request #86 from abraham1901/master 
Add location priority option
 2013-07-09 07:22:14 -07:00
James Fryman
bf8851ee8b Merge pull request #87 from Jonanin/custom_cfg 
Sort location_custom_cfg hash to prevent random ordering
 2013-07-08 18:44:51 -07:00
Jon Morton
b3ea7b3170 Sort location_custom-cfg hash to prevent random ordering 2013-07-08 20:10:11 -05:00
Lebedev Vadim
a3a1d11400 * Add location priority option 2013-07-08 23:06:02 +04: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
Jon Morton
d401841279 Change custom_cfg to location_custom_cfg 2013-07-03 15:54:33 -05:00
Jon Morton
d83822810e Add support for locations with only custom directives 2013-07-03 01:47:49 -05:00
Igor Ajdisek
8f49ffa775 vhosts_ssl_header.erb was missing access_log and error_log directives 2013-06-28 10:12:01 +02:00
Igor Ajdisek
e0e5757b55 Made SPDY a toggle param. 
Added ssl_ciphers and ssl_protocols as params which default to values as proposed on nginx.org.
If SSL vhost then ssl is added to listen directive as proposed on nginx.org.
 2013-06-27 15:42:38 +02:00
Stefan Dorosz
179b1a4b5d Add server_names_hash_bucket_size param 2013-06-20 10:48:52 -04:00
Lebedev Vadim
d7cdd68c63 Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 17:15:59 +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
James Fryman
169dd8b0d6 Merge pull request #53 from hingstarne/master 
Added some minor enhancements
 2013-05-15 10:22:46 -07:00
Bayard Randel
896d6658bb added params for types_hash_max_size and types_hash_bucket_size expected by nginx 1.2.x 2013-05-14 14:57:35 +12:00
Arne Hingst
921d7f7d57 ability to add include statements for static config files fro ghosts 2013-05-13 10:57:58 +02:00