summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-19 16:07:01 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-19 16:07:01 -0200
commitbdc4c8b05c52b0bb3695047f3b21333e66eab27c (patch)
treecf7e477c3f0ba1e284c4b6bf48bbd88170f8e0ef /manifests
parent5e44dc7d3ff8379f77b56c89e84f7d5409429fe8 (diff)
downloadpuppet-hotglue-bdc4c8b05c52b0bb3695047f3b21333e66eab27c.tar.gz
puppet-hotglue-bdc4c8b05c52b0bb3695047f3b21333e66eab27c.tar.bz2
Upgrading for 2.7 compatibility --config
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp17
1 files changed, 8 insertions, 9 deletions
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"],
}
}