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
..
fastcgi_params.erb	* Option fastcgi_script fixed	2013-08-01 00:56:32 +04:00
vhost_footer.erb	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-08-23 01:07:53 +04:00
vhost_header.erb	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-08-23 01:07:53 +04:00
vhost_location_alias.erb	Update vhost_location_alias.erb	2013-08-15 21:05:02 +02:00
vhost_location_directory.erb	Update vhost_location_directory.erb	2013-08-15 21:05:38 +02:00
vhost_location_empty.erb	Update vhost_location_empty.erb	2013-08-15 21:06:23 +02:00
vhost_location_fastcgi.erb	Update vhost_location_fastcgi.erb	2013-08-15 21:07:06 +02:00
vhost_location_proxy.erb	Update vhost_location_proxy.erb	2013-08-15 21:07:40 +02:00
vhost_location_stub_status.erb	Update vhost_location_stub_status.erb	2013-08-15 21:08:03 +02:00
vhost_ssl_header.erb	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-08-23 01:07:53 +04:00