aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-17 16:53:34 +0000
committerMichael Scherer <misc@mageia.org>2012-03-17 16:53:34 +0000
commit50cb0e9b376e8efdbf0e581fba5da5b181097e3c (patch)
tree4f1e01aaaaee9234f98446fcfcb028314ad5a8c6
parent1076619b947ae292ab37af30a2e3b6a91af0813a (diff)
downloadpuppet-50cb0e9b376e8efdbf0e581fba5da5b181097e3c.tar
puppet-50cb0e9b376e8efdbf0e581fba5da5b181097e3c.tar.gz
puppet-50cb0e9b376e8efdbf0e581fba5da5b181097e3c.tar.bz2
puppet-50cb0e9b376e8efdbf0e581fba5da5b181097e3c.tar.xz
puppet-50cb0e9b376e8efdbf0e581fba5da5b181097e3c.zip
scoping and style fix, found by puppet-lint
-rw-r--r--deployment/websites/manifests/releases.pp34
1 files changed, 17 insertions, 17 deletions
diff --git a/deployment/websites/manifests/releases.pp b/deployment/websites/manifests/releases.pp
index 4cb88d67..26d14bcf 100644
--- a/deployment/websites/manifests/releases.pp
+++ b/deployment/websites/manifests/releases.pp
@@ -1,22 +1,22 @@
-class websites {
- class releases inherits base {
- $vhostdir = "$webdatadir/releases.$domain"
- $svn_location = "svn://svn.$domain/svn/web/releases/"
+class websites::releases {
+ include websites::base
+ $vhost = "releases.$::domain"
+ $vhostdir = "$websites::base::webdatadir/$vhost"
+ $svn_location = "svn://svn.$::domain/svn/web/releases/"
- apache::vhost_base { "releases.$domain":
- location => $vhostdir,
- options => [ "FollowSymLinks" ],
- }
+ apache::vhost_base { $vhost:
+ location => $vhostdir,
+ options => [ 'FollowSymLinks' ],
+ }
- apache::vhost_base { "ssl_releases.$domain":
- vhost => "releases.$domain",
- use_ssl => true,
- location => $vhostdir,
- options => [ "FollowSymLinks" ],
- }
+ apache::vhost_base { "ssl_$vhost":
+ vhost => $vhost,
+ use_ssl => true,
+ location => $vhostdir,
+ options => [ 'FollowSymLinks' ],
+ }
- subversion::snapshot { "$vhostdir":
- source => $svn_location,
- }
+ subversion::snapshot { $vhostdir:
+ source => $svn_location,
}
}