opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jfryman/puppet-nginx

Browse source 
Conflicts:
	README.markdown
	manifests/resource/location.pp
This commit is contained in:
James Fryman 2012-08-27 09:29:46 -05:00
commit 4d02012150
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.markdown
View file

@ -27,7 +27,6 @@ Setup a new virtual host
</pre> </pre>
Add a Proxy Server(s) Add a Proxy Server(s)
<pre> <pre>
node default { node default {
class { 'mcollective': } class { 'mcollective': }

1
manifests/resource/location.pp
View file

@ -25,6 +25,7 @@
# location => '/bob', # location => '/bob',
# vhost => 'test2.local', # vhost => 'test2.local',
# } # }
<<<<<<< HEAD
define nginx::resource::location( define nginx::resource::location(
$ensure = present, $ensure = present,
$vhost = undef, $vhost = undef,