From 814d434eb7e7d8a89dac98b1a60afc10a6980617 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Mon, 19 Oct 2015 20:16:53 +0300
Subject: lint fixes for websites

---
 deployment/websites/manifests/archives.pp    |  4 ++--
 deployment/websites/manifests/base.pp        |  8 ++++----
 deployment/websites/manifests/doc.pp         |  4 ++--
 deployment/websites/manifests/forum_proxy.pp |  6 +++---
 deployment/websites/manifests/nav.pp         | 12 +++++------
 deployment/websites/manifests/perl.pp        | 30 ++++++++++++++--------------
 deployment/websites/manifests/releases.pp    |  4 ++--
 deployment/websites/manifests/start.pp       |  2 +-
 deployment/websites/manifests/static.pp      |  2 +-
 deployment/websites/manifests/www.pp         | 10 +++++-----
 10 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/deployment/websites/manifests/archives.pp b/deployment/websites/manifests/archives.pp
index 5680631e..9180813b 100644
--- a/deployment/websites/manifests/archives.pp
+++ b/deployment/websites/manifests/archives.pp
@@ -1,14 +1,14 @@
 class websites::archives {
     include websites::base
     $vhost = "archives.$::domain"
-    $vhostdir = "$websites::base::webdatadir/$vhost"
+    $vhostdir = "$websites::base::webdatadir/${vhost}"
     $git_location = "git://git.$::domain/web/archives"
 
     apache::vhost::base { $vhost:
         location => $vhostdir,
     }
 
-    apache::vhost::base { "ssl_$vhost":
+    apache::vhost::base { "ssl_${vhost}":
         vhost    => $vhost,
         use_ssl  => true,
         location => $vhostdir,
diff --git a/deployment/websites/manifests/base.pp b/deployment/websites/manifests/base.pp
index 32c26808..1c2dbc64 100644
--- a/deployment/websites/manifests/base.pp
+++ b/deployment/websites/manifests/base.pp
@@ -1,9 +1,9 @@
 class websites::base {
     $webdatadir = '/var/www/vhosts'
     file { $webdatadir:
-	ensure => directory,
-	mode => 0755,
-	owner => root,
-	group => root
+        ensure => directory,
+        mode   => '0755',
+        owner  => root,
+        group  => root
     }
 }
diff --git a/deployment/websites/manifests/doc.pp b/deployment/websites/manifests/doc.pp
index a9f62afe..69b2a3a4 100644
--- a/deployment/websites/manifests/doc.pp
+++ b/deployment/websites/manifests/doc.pp
@@ -1,14 +1,14 @@
 class websites::doc {
     include websites::base
     $vhost = "doc.$::domain"
-    $vhostdir = "$websites::base::webdatadir/$vhost"
+    $vhostdir = "$websites::base::webdatadir/${vhost}"
     $git_location = "git://git.$::domain/web/doc"
 
     apache::vhost::base { $vhost:
         location => $vhostdir,
     }
 
-    apache::vhost::base { "ssl_$vhost":
+    apache::vhost::base { "ssl_${vhost}":
         vhost    => $vhost,
         use_ssl  => true,
         location => $vhostdir,
diff --git a/deployment/websites/manifests/forum_proxy.pp b/deployment/websites/manifests/forum_proxy.pp
index 06e9f433..1cb6c034 100644
--- a/deployment/websites/manifests/forum_proxy.pp
+++ b/deployment/websites/manifests/forum_proxy.pp
@@ -2,12 +2,12 @@ class websites::forum_proxy {
     $web_domain = "forums.$::domain"
 
     apache::vhost::reverse_proxy { $web_domain:
-        url => "http://$web_domain/",
+        url => "http://${web_domain}/",
     }
 
-    apache::vhost::reverse_proxy { "ssl_$web_domain":
+    apache::vhost::reverse_proxy { "ssl_${web_domain}":
         vhost   => $web_domain,
         use_ssl => true,
-        url     => "http://$web_domain/",
+        url     => "http://${web_domain}/",
     }
 }
diff --git a/deployment/websites/manifests/nav.pp b/deployment/websites/manifests/nav.pp
index c020f50b..d0a6e295 100644
--- a/deployment/websites/manifests/nav.pp
+++ b/deployment/websites/manifests/nav.pp
@@ -1,14 +1,14 @@
 class websites::nav {
     include websites::base
     $vhost = "nav.$::domain"
-    $vhostdir = "$websites::base::webdatadir/$vhost"
+    $vhostdir = "$websites::base::webdatadir/${vhost}"
     $git_location = "git://git.$::domain/web/nav"
 
     apache::vhost::base { $vhost:
         location => $vhostdir,
     }
 
-    apache::vhost::base { "ssl_$vhost":
+    apache::vhost::base { "ssl_${vhost}":
         vhost    => $vhost,
         use_ssl  => true,
         location => $vhostdir,
@@ -18,10 +18,10 @@ class websites::nav {
         source => $git_location,
     }
 
-    file { "$vhostdir/var/tmp/cache":
-        ensure => directory,
-        mode => '0660',
-        group => $apache::var::apache_group,
+    file { "${vhostdir}/var/tmp/cache":
+        ensure  => directory,
+        mode    => '0660',
+        group   => $apache::var::apache_group,
         require => Git::Snapshot[$vhostdir],
     }
 }
diff --git a/deployment/websites/manifests/perl.pp b/deployment/websites/manifests/perl.pp
index 041bde63..ec48c5a3 100644
--- a/deployment/websites/manifests/perl.pp
+++ b/deployment/websites/manifests/perl.pp
@@ -1,10 +1,10 @@
 class websites::perl {
     include websites::base
-    $vhost = "perl.$::domain"
-    $vhostdir = "$websites::base::webdatadir/$vhost"
+    $vhost    = "perl.$::domain"
+    $vhostdir = "$websites::base::webdatadir/${vhost}"
     $statsdir = "${vhostdir}/stats"
-    $login = 'pkgcpan'
-    $homedir = "/var/lib/$login"
+    $login    = 'pkgcpan'
+    $homedir  = "/var/lib/${login}"
 
     user { $login:
         managehome => true,
@@ -26,29 +26,29 @@ class websites::perl {
 
     cron { 'update cpanpkg':
         hour    => 23,
-	minute	=> 0,
+        minute  => 0,
         require => Package['perl-Module-Packaged-Generator'],
-        command => "pkgcpan -q -f $vhostdir/cpan_Mageia.db -d Mageia && chmod 644 $vhostdir/cpan_Mageia.db",
+        command => "pkgcpan -q -f ${vhostdir}/cpan_Mageia.db -d Mageia && chmod 644 ${vhostdir}/cpan_Mageia.db",
         user    => $login,
     }
 
-    file { "$vhostdir/cpan_Mageia.db":
+    file { "${vhostdir}/cpan_Mageia.db":
         owner => $login,
         group => $login,
     }
 
     file { $statsdir:
-	ensure => directory,
-	owner => $login,
-	group => $login,
+        ensure => directory,
+        owner  => $login,
+        group  => $login,
     }
 
     # http://www.mageia.org/pipermail/mageia-sysadm/2012-March/004337.html
     cron { 'update pkgcpan stats':
-	hour	=> 23,
-	minute	=> 30,
-	require => [ Package['magpie'], File[$statsdir] ],
-	command => "magpie webstatic -qq -d $statsdir",
-	user	=> $login,
+        hour    => 23,
+        minute  => 30,
+        require => [ Package['magpie'], File[$statsdir] ],
+        command => "magpie webstatic -qq -d ${statsdir}",
+        user    => $login,
     }
 }
diff --git a/deployment/websites/manifests/releases.pp b/deployment/websites/manifests/releases.pp
index 2412fcc5..afb923c8 100644
--- a/deployment/websites/manifests/releases.pp
+++ b/deployment/websites/manifests/releases.pp
@@ -1,7 +1,7 @@
 class websites::releases {
     include websites::base
     $vhost = "releases.$::domain"
-    $vhostdir = "$websites::base::webdatadir/$vhost"
+    $vhostdir = "$websites::base::webdatadir/${vhost}"
     $git_location = "git://git.$::domain/web/releases"
 
     apache::vhost::base { $vhost:
@@ -9,7 +9,7 @@ class websites::releases {
         options  => [ 'FollowSymLinks' ],
     }
 
-    apache::vhost::base { "ssl_$vhost":
+    apache::vhost::base { "ssl_${vhost}":
         vhost    => $vhost,
         use_ssl  => true,
         location => $vhostdir,
diff --git a/deployment/websites/manifests/start.pp b/deployment/websites/manifests/start.pp
index e4c383ce..d73b4f9c 100644
--- a/deployment/websites/manifests/start.pp
+++ b/deployment/websites/manifests/start.pp
@@ -1,6 +1,6 @@
 class websites::start {
     include websites::base
     apache::vhost_redirect { "start.$::domain":
-	url => "http://www.mageia.org/community/",
+        url => "http://www.$::domain/community/",
     }
 }
diff --git a/deployment/websites/manifests/static.pp b/deployment/websites/manifests/static.pp
index b82b9029..f2efa792 100644
--- a/deployment/websites/manifests/static.pp
+++ b/deployment/websites/manifests/static.pp
@@ -10,7 +10,7 @@ class websites::static {
         ensure => directory,
     }
 
-    git::snapshot { "$vhostdir":
+    git::snapshot { "${vhostdir}":
         source => "git://git.$::domain/web/www",
     }
 }
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index e4ddfd69..0a84f7e9 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -1,7 +1,7 @@
 class websites::www {
     include websites::base
     $vhost = "www.$::domain"
-    $vhostdir = "$websites::base::webdatadir/$vhost"
+    $vhostdir = "$websites::base::webdatadir/${vhost}"
     $git_location = "git://git.$::domain/web/www"
 
     include apache::var
@@ -15,28 +15,28 @@ class websites::www {
         source => $git_location,
     }
 
-    file { "$vhostdir/var/tmp/cache":
+    file { "${vhostdir}/var/tmp/cache":
         ensure   => directory,
         group    => $apache::var::apache_group,
         mode     => '0660',
         require  => Git::Snapshot[$vhostdir],
     }
 
-    file { "$vhostdir/_nav/var/tmp/cache":
+    file { "${vhostdir}/_nav/var/tmp/cache":
         ensure   => directory,
         group    => $apache::var::apache_group,
         mode     => '0660',
         require  => Git::Snapshot[$vhostdir],
     }
 
-    apache::vhost::base { $vhost:
+    apache::vhost::base { $vhost}:
         content  => template('websites/vhost_www.conf',
                              'websites/vhost_www_rewrite.conf'),
         location => $vhostdir,
         options  => ['FollowSymLinks'],
     }
 
-    apache::vhost::base { "ssl_$vhost":
+    apache::vhost::base { "ssl_${vhost}":
         use_ssl  => true,
         vhost    => $vhost,
         content  => template('websites/vhost_www.conf',
-- 
cgit v1.2.1