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
..
conf.d	Add logging customization to the main logs as well.	2013-08-07 21:27:13 -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 into dev	2013-08-23 01:07:53 +04:00