diff options
| author | Michael Scherer <misc@mageia.org> | 2012-02-10 14:20:13 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-02-10 14:20:13 +0000 |
| commit | 3e297d2715935bbb0ee3071665240761868f6d80 (patch) | |
| tree | 01f52df7adbb08a5490437e0473aa7bfc6674c1d | |
| parent | 69d17cdcd1c94e4f1296e302e86d647ee9079bf4 (diff) | |
| download | puppet-3e297d2715935bbb0ee3071665240761868f6d80.tar puppet-3e297d2715935bbb0ee3071665240761868f6d80.tar.gz puppet-3e297d2715935bbb0ee3071665240761868f6d80.tar.bz2 puppet-3e297d2715935bbb0ee3071665240761868f6d80.tar.xz puppet-3e297d2715935bbb0ee3071665240761868f6d80.zip | |
make the module compliant ith changes coming with puppet 2.8 and with puppet-lint
| -rw-r--r-- | deployment/websites/manifests/hugs.pp | 22 | ||||
| -rw-r--r-- | deployment/websites/manifests/static.pp | 23 |
2 files changed, 22 insertions, 23 deletions
diff --git a/deployment/websites/manifests/hugs.pp b/deployment/websites/manifests/hugs.pp index 628d2b15..472066c7 100644 --- a/deployment/websites/manifests/hugs.pp +++ b/deployment/websites/manifests/hugs.pp @@ -1,16 +1,16 @@ -class websites { - class hugs inherits base { - $vhostdir = "$webdatadir/hugs.$domain" - $svn_location = "svn://svn.$domain/svn/web/hugs/public/" +class websites::hugs { + include websites::base - apache::vhost_base { "hugs.$domain": - location => $vhostdir, - } + $vhostdir = "$websites::base::webdatadir/hugs.$::domain" + $svn_location = "svn://svn.$::domain/svn/web/hugs/public/" - subversion::snapshot { "$vhostdir": - source => $svn_location - } + apache::vhost_base { "hugs.$::domain": + location => $vhostdir, + } - package { php-exif: } + subversion::snapshot { $vhostdir: + source => $svn_location } + + package { 'php-exif': } } diff --git a/deployment/websites/manifests/static.pp b/deployment/websites/manifests/static.pp index 0883d779..41b4f332 100644 --- a/deployment/websites/manifests/static.pp +++ b/deployment/websites/manifests/static.pp @@ -1,17 +1,16 @@ -class websites { - class static inherits base { - $vhostdir = "$webdatadir/static.$domain" +class websites::static { + include websites::base + $vhostdir = "$websites::base::webdatadir/static.$::domain" - apache::vhost_other_app { "static.$domain": - vhost_file => 'websites/vhost_static.conf', - } + apache::vhost_other_app { "static.$::domain": + vhost_file => 'websites/vhost_static.conf', + } - file { $vhostdir: - ensure => directory, - } + file { $vhostdir: + ensure => directory, + } - subversion::snapshot { "$vhostdir/g": - source => "svn://svn.$domain/svn/web/www/trunk/g/", - } + subversion::snapshot { "$vhostdir/g": + source => "svn://svn.$::domain/svn/web/www/trunk/g/", } } |