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

212 commits

Author SHA1 Message Date
Mike Lerch
73158c112d allow resolvers in non-ssl vhosts 2014-05-02 10:17:10 -07:00
James Fryman
4d816c990a Merge pull request #305 from andschwa/patch-alias_autoindex 
Adding autoindex to location alias
 2014-04-24 11:13:07 -05:00
Andrew Schwartzmeyer
12004e86b7 Adding autoindex to location alias 
Fix for issue #304

I don't see any reason why autoindex shouldn't be used with alias
directive, nor does jaybe on #nginx.
 2014-04-23 22:11:21 -07:00
Harry Danes
f5fac8b245 Introduced log_by_lua and log_by_lua_file params. 2014-04-18 11:57:31 +02:00
Lebedev Vadim
7b33e458a9 * fix 2014-04-13 13:26:25 +04:00
Lebedev Vadim
19acfe0356 Add option proxy_connect_timeout 
Bug fix
 2014-04-12 23:17:45 +04:00
Lebedev Vadim
e1bcb3e2cb Remove duplicate location_allow & location_deny 2014-04-11 23:36:15 +04:00
Lebedev Vadim
3721ce1194 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/package/debian.pp
 2014-04-11 23:16:53 +04:00
Lebedev Vadim
24c93968b3 Added location_allow & location_deny to fastcgi location 2014-04-11 19:43:54 +04:00
James Fryman
20a7ea01b1 Merge pull request #289 from b4ldr/master 
Add additional config to the locations resource and fix set_header in vhost resource
 2014-04-09 12:13:11 -05:00
John Bond
1b7ac9ab43 Add additional config to the locations section of config 
Following parameters where added to the location resourse.  These
already existsed in the vhost resource so the same logic and defaults
where used
  * proxy_set_header
  * proxy_connect_timeout
  * proxy_redirect
 2014-04-09 17:48:32 +02:00
Paul de Raaij
1fbfe531b7 Add configuring multiple resolvers via an array instead of a string 2014-04-03 11:59:47 +02:00
Robin Gloster
08d46d02cb Add allow/deny rules to fastcgi template 2014-03-22 01:23:38 +01:00
eSe
2271ce5255 Fix indent for location parameters to 4 spaces 2014-03-12 17:18:05 +01:00
eSe
0ade406a89 Remove Arrays as keys in templates 2014-03-11 17:24:30 +01:00
eSe
7614bceec1 Fix custom_cfg_[prepend,append] 2014-03-10 12:52:12 +01:00
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
c07d99c5db Allow values to be hashes at prepend,append,custom cfg for locations 2014-03-05 17:05:46 +01:00
pessoa
ca151970e6 add location_custom_cfg_prepend support 2014-02-17 19:51:14 +00: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
Markus Rekkenbeil
971e1a7692 Update vhost_location documentation and template 2014-02-10 18:14:18 +01: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
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
Tristan Helmich
15a2695442 Move ipv6only=on option from template into puppet 
See jfryman#30
 2014-02-03 12:54: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
TJ Biddle
52b124e505 Adding client_max_body_size. 2014-01-28 12:52:56 -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
Lebedev Vadim
d340eea512 remove sort array in location_custom_cfg_* 2014-01-17 20:08:01 +04:00
Lebedev Vadim
a4ddf886b2 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 2014-01-14 19:57:45 +04:00
Matthew Haughton
dc3817f9ae added rewrite to location/proxy & vhost 
With credit to https://github.com/OmarzT
 2014-01-13 13:20:02 -05:00
Lebedev Vadim
e94af129e4 Fixed long names virtual hosts, such as nginx::resource::vhost { 'name1.domainname.org name2.domainname.org': } 
Add example nginx::vhost with HTTPS FastCGI and redirection of HTTP
Add location_custom_cfg_prepend & location_custom_cfg_append. Used for logical structures such as if.
Fix puppet-lint
 2014-01-12 23:15:14 +04:00
Chris D'Ambrosio
78e025b250 Fix index_files ivar warning 
Fix the index_files instance variable deprecation warning.
 2014-01-05 22:44:54 -08:00
Omar Tamer
1566daa60f added rewrite to location/proxy & vhost 2014-01-02 18:13:59 +00:00
James Fryman
64c055ce38 revert #218 /cc https://github.com/jfryman/puppet-nginx/pull/218#issuecomment-31458745 2014-01-02 09:49:58 -06:00
Andreyev Dias de Melo
44cf3d4b2b Separating the options to avoid invalid one like "ssldefault" 2014-01-02 11:10:52 -02:00
Harry Danes
1d90dacfb3 Merge commit '96475098ebd4fba7dd951efcee1c6ee38b2935a9' into ssl_dhparam 
Conflicts:
	manifests/resource/vhost.pp
 2013-12-30 18:33:53 +01:00
James Fryman
96475098eb Merge pull request #214 from hdanes/master 
Fix warning: Variable access via 'index_files' is deprecated.
 2013-12-30 09:14:35 -08:00
Harry Danes
334ebde9b6 Fix warning: Variable access via 'index_files' is deprecated. Use '@index_files' instead. 2013-12-29 16:13:17 +01:00
Harry Danes
d0c3168592 Implementation of the resolver parameter. 2013-12-29 15:48:32 +01:00
Harry Danes
1aff2eabcb Implementation for the ssl_stapling_* parameters. 2013-12-29 15:39:21 +01:00
Harry Danes
3db6a726cb Add support for Diffie-Hellman parameters in VHOST resource. 2013-12-27 09:10:11 +01:00
Lebedev Vadim
611c80f75e Fixed the ability to disable the index_files 2013-12-25 04:13:22 +04:00
James Fryman
7d1540b3bb Merge pull request #208 from hdanes/add_header 
Add the possibility to add a header to the HTTP response
 2013-12-24 10:50:29 -08:00
Harry Danes
fcf11a8b18 Add the possibility to add a header to the HTTP response when response code is equal to 200, 204, 301, 302 or 304. 2013-12-24 13:07:58 +01:00
James Fryman
ee70673935 Merge pull request #204 from openquery/index_files_to_serverlevel 
index_files to be defined at server level if specified in resource::vhost
 2013-12-19 06:59:43 -08:00
Daniel Black
f338f304c5 Force index_files to Array before iteration in templates 2013-12-19 15:51:59 +10:00
James Fryman
5fa314114d Merge pull request #202 from openquery/vhost_ssl_normalisation 
Add proxy_set_header to vhost_ssl_header to be the same as vhost_header
 2013-12-18 21:27:06 -08:00
Daniel Black
520eb23ffd index_files to be defined at server level if specified in resource::vhost 
This partially avoids pitfall #2 (http://wiki.nginx.org/Pitfalls)
 2013-12-19 09:07:56 +10:00
Daniel Black
b7132bc10a ipv6 port to ssl_port with ssl and spdy (if enabled) options. Closes gh-198 2013-12-19 08:54:03 +10:00
Daniel Black
f26943540a Add proxy_set_header to vhost_ssl_header to be the same as vhost_header 2013-12-19 08:47:49 +10:00
Markus Rekkenbeil
b79259ed8b Add nginx autoindex to resource nginx::location and style up the 
nginx::vhost directory template

Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
 2013-12-16 17:36:24 +01:00
Markus Rekkenbeil
b7986f3dc3 Add nginx::vhost option 'autoindex' 
Signed-off-by: Markus Rekkenbeil <markus@bionix-it.de>
 2013-12-12 17:27:29 +01:00
Matthew Haughton
a0258920d1 Fix Puppet 3.2.x deprecation warnings 2013-12-08 17:01:12 -05:00
Dominik Richter
709c25e82e simplified checks if variables are set in vhost_location_proxy template 
kudos to Matthew Haughton for this suggestion

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 19:56:04 +01:00
Dominik Richter
a83c513ac4 feature: add configurable proxy_set_body to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
Dominik Richter
a578dcea50 feature: add configurable proxy_method to vhost and location resources 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2013-11-27 15:12:56 +01:00
Matthew Haughton
43d628d4f0 fix auth_basic/auth_basic_user_file variable detection 2013-11-21 23:22:01 -05:00
Matthew Haughton
99e9d82f12 accept boolean for ipv6_enable as documented 2013-11-21 23:18:04 -05:00
Matthew Haughton
e1c4c7470b sort vhost_cfg_append in vhost_ssl_footer 2013-11-21 23:08:36 -05:00
Matthew Haughton
4af2087867 fix spacing issues in various templates 
Before this change, vhost_ssl_header would merge
"ssl" with any listen options, e.g.:
    listen       *:443 ssldefault;
when listen_options => 'default'.
 2013-11-21 23:04:39 -05:00
Matthew Haughton
ef2a5e4f15 fix syntax of allow/deny directives 2013-11-21 22:35:44 -05:00
Matthew Haughton
3024f2927d fix IPv6 address fact detection 2013-11-21 22:32:23 -05:00
Tomas Barton
4e41871dac fixed acces to vhost_cfg_append via instance variable 2013-09-30 00:46:17 +02:00
Tomas Barton
82ce9223a9 possibility to disable default location 2013-09-29 20:53:25 +02:00
Tomas Barton
2cc0a2fcf0 support ssl_cache and for passenger cgi params 2013-09-29 20:36:19 +02:00
James Fryman
315d7e109f Merge pull request #120 from abraham1901/dev 
Aggregated some PR & tested & simple bug fix & add new option
 2013-09-15 17:29:56 -07:00
James Fryman
6f2eb74558 Merge pull request #140 from alanpearce/patch-1 
Fix deprecated variable access warning in vhost footer template
 2013-09-15 17:26:14 -07:00
Todd Eddy
9252351986 Fix stub_status location so it has line breaks. 2013-09-14 04:24:01 -04:00
Alan Pearce
05c260a963 Fix deprecated variable access warning in vhost footer template 2013-09-13 15:29:50 +01:00
Lebedev Vadim
20a37a220f Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/config.pp
	manifests/resource/location.pp
 2013-09-08 16:50:16 +04:00
James Fryman
59106eae7c Merge pull request #128 from leoc/fix-www-rewrite-port 
Use correct port for www rewrite
 2013-09-06 08:44:49 -07:00
Lebedev Vadim
757bb87031 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/params.pp
	manifests/resource/location.pp
	manifests/resource/vhost.pp
	templates/vhost/vhost_header.erb
 2013-09-05 12:01:00 +04:00
Lebedev Vadim
4f27265047 remove each_line 2013-09-05 11:43:44 +04:00
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
Arthur Leonard Andersen
6934271b85 Use correct port for www rewrite 2013-09-03 23:42:16 +02: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
Lebedev Vadim
15519e7eef Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev 
Conflicts:
	manifests/package/redhat.pp
	templates/vhost/vhost_footer.erb
	templates/vhost/vhost_header.erb
 2013-08-23 01:07:53 +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
root
f609f9601d Adding option http_cfg_prepend to class nginx 2013-08-22 23:02:04 +04:00
root
0a53d710c2 Merge branch 'sort_vhost_cfg_append' of https://github.com/jhoblitt/puppet-nginx into dev 2013-08-22 22:24:55 +04:00
Joshua Hoblitt
b8189496a3 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-16 16:29:05 -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