module-nginx/templates/vhost
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
..
fastcgi_params.erb * Option fastcgi_script fixed 2013-08-01 00:56:32 +04:00
vhost_footer.erb Merge https://github.com/ese/puppet-nginx into hash 2014-03-08 01:20:58 +11:00
vhost_header.erb Key value parameter maps to take array as value 2014-03-07 23:53:32 +11:00
vhost_location_alias.erb Merge https://github.com/ese/puppet-nginx into hash 2014-03-08 01:20:58 +11:00
vhost_location_directory.erb Merge https://github.com/ese/puppet-nginx into hash 2014-03-08 01:20:58 +11:00
vhost_location_empty.erb Merge https://github.com/ese/puppet-nginx into hash 2014-03-08 01:20:58 +11:00
vhost_location_fastcgi.erb Merge https://github.com/ese/puppet-nginx into hash 2014-03-08 01:20:58 +11:00
vhost_location_proxy.erb Merge https://github.com/ese/puppet-nginx into hash 2014-03-08 01:20:58 +11:00
vhost_location_stub_status.erb Merge https://github.com/ese/puppet-nginx into hash 2014-03-08 01:20:58 +11:00
vhost_ssl_footer.erb Key value parameter maps to take array as value 2014-03-07 23:53:32 +11:00
vhost_ssl_header.erb Key value parameter maps to take array as value 2014-03-07 23:53:32 +11:00