Lebedev Vadim 3721ce1194 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev ... Conflicts: manifests/package/debian.pp		2014-04-11 23:16:53 +04:00
..
location.pp	Add additional config to the locations section of config	2014-04-09 17:48:32 +02:00
mailhost.pp	Remove trailing whitespaces	2014-04-11 20:04:24 +04:00
upstream.pp	Merge pull request #171 from thomasbiddle/upstream_fail_timeout	2014-01-28 12:57:14 -08:00
vhost.pp	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2014-04-11 23:16:53 +04:00