opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
module-nginx/templates
History
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
..
conf.d Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 16:30:21 +04:00
mailhost add support for mail module 2013-04-06 11:11:23 +02:00
vhost Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-05-21 16:30:21 +04:00