module-nginx/templates/vhost
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
..
vhost_footer.erb Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 16:30:21 +04:00
vhost_header.erb Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 16:30:21 +04:00
vhost_location_alias.erb Stabilize key/value output by sorting hashes on key. 2013-05-09 14:51:31 +02:00
vhost_location_directory.erb Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 16:30:21 +04:00
vhost_location_fastcgi.erb * Get ssl key/cert with provided file-locations 2013-04-16 20:12:32 +04:00
vhost_location_proxy.erb Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 16:30:21 +04:00
vhost_location_stub_status.erb Stabilize key/value output by sorting hashes on key. 2013-05-09 14:51:31 +02:00
vhost_ssl_header.erb Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 16:30:21 +04:00