clean the module from puppet-lint error, and make sure scoping is properly used

for fact. Do not hardcode the distro name either.

1 files changed, 49 insertions, 49 deletions

diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index b42d4c2c..aa255e27 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -1,51 +1,51 @@
-class websites {
-    class www inherits base {
-        $vhost = "www.$domain"
-        $vhostdir = "$webdatadir/www.$domain"
-        $svn_location = "svn://svn.$domain/svn/web/www/trunk"
-
-        include apache::mod_php
-        include apache::mod_geoip
-
-        # for mailman reverse proxy, on ssl
-        include apache::mod_proxy
-        include apache::mod_ssl
-
-        subversion::snapshot { $vhostdir:
-            source => $svn_location,
-        }
-
-        file { "$vhostdir/var/tmp/cache":
-            ensure => directory,
-            owner => root,
-            group => $apache::base::apache_group,
-            mode => 0660,
-        }
-
-        apache::vhost_base { "$vhost":
-            content => template('websites/vhost_www.conf', "websites/vhost_proxy_mailman.conf"),
-            location => $vhostdir,
-            options => ['FollowSymLinks'],
-        }
-
-        apache::vhost_base { "ssl_$vhost":
-            use_ssl => true,
-            vhost => $vhost,
-            content => template('websites/vhost_www.conf', "websites/vhost_proxy_mailman_ssl.conf"),
-            location => $vhostdir,
-            options => ['FollowSymLinks'],
-        }
-
-        apache::vhost_redirect { $domain:
-            url => 'http://www.mageia.org/',
-        }
-
-        apache::vhost_redirect { "ssl_$domain":
-            use_ssl => true,
-            vhost => $domain,
-            url => 'https://www.mageia.org/',
-        }
-
-        package { ['php-mbstring', 'php-mcrypt', 'php-gettext', 'php-geoip']: }
+class websites::www {
+    include websites::base
+    $vhost = "www.$::domain"
+    $vhostdir = "$websites::base::webdatadir/$vhost"
+    $svn_location = "svn://svn.$::domain/svn/web/www/trunk"
+
+    include apache::mod_php
+    include apache::mod_geoip
+
+    # for mailman reverse proxy, on ssl
+    include apache::mod_proxy
+    include apache::mod_ssl
+
+    subversion::snapshot { $vhostdir:
+        source => $svn_location,
+    }
+
+    file { "$vhostdir/var/tmp/cache":
+        ensure => directory,
+        group  => $apache::base::apache_group,
+        mode   => '0660',
+    }
+
+    $mailman_content = template('websites/vhost_www.conf',
+                                'websites/vhost_proxy_mailman.conf')
+    apache::vhost_base { $vhost:
+        content  => $mailman_content,
+        location => $vhostdir,
+        options  => ['FollowSymLinks'],
     }
+
+    apache::vhost_base { "ssl_$vhost":
+        use_ssl  => true,
+        vhost    => $vhost,
+        content  => $mailman_content,
+        location => $vhostdir,
+        options  => ['FollowSymLinks'],
+    }
+
+    apache::vhost_redirect { $::domain:
+        url => "http://www.$::domain/",
+    }
+
+    apache::vhost_redirect { "ssl_$::domain":
+        use_ssl => true,
+        vhost   => $::domain,
+        url     => "https://www.$::domain/",
+    }
+
+    package { ['php-mbstring', 'php-mcrypt', 'php-gettext', 'php-geoip']: }
 }