From bdc4c8b05c52b0bb3695047f3b21333e66eab27c Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 19 Jan 2013 16:07:01 -0200 Subject: Upgrading for 2.7 compatibility --config --- manifests/init.pp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index 1d3775f..dd39e37 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,9 +1,8 @@ -class hotglue { - case $apache_www_folder { - '': { $apache_www_folder = "/var/www" } - } +class hotglue( + $folder = ${apache::www_folder} +) { - vcsrepo { "${apache_www_folder}/hotglue2": + vcsrepo { "${folder}/hotglue2": ensure => present, provider => git, source => 'https://github.com/hotglue/hotglue2.git', @@ -12,20 +11,20 @@ class hotglue { group => 'root', } - file { "${apache_www_folder}/hotglue2/sites": + file { "${folder}/hotglue2/sites": ensure => directory, owner => root, group => root, mode => 0755, - require => Vcsrepo["${apache_www_folder}/hotglue2"], + require => Vcsrepo["${folder}/hotglue2"], } - file { "${apache_www_folder}/hotglue2/user-config.inc.php": + file { "${folder}/hotglue2/user-config.inc.php": ensure => present, owner => root, group => root, mode => 0644, source => "puppet:///modules/hotglue/user-config.inc.php", - require => Vcsrepo["${apache_www_folder}/hotglue2"], + require => Vcsrepo["${folder}/hotglue2"], } } -- cgit v1.2.3