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:
	manifests/package/redhat.pp
This commit is contained in:
James Fryman 2012-08-28 14:36:40 -05:00
commit 721fb2f79f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/package/redhat.pp
View file

@ -15,7 +15,7 @@
# This class file is not called directly
class nginx::package::redhat {
$redhat_packages = ['nginx', 'GeoIP', 'gd', 'libXpm', 'libxslt']
$os_type = downcase($::operatingsystem)
yumrepo { "nginx-release":

2
manifests/resource/location.pp
View file

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