From 9b43b0f9a934081f2996b77a2cda61ec43e63e24 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Tue, 20 Oct 2015 11:04:37 +0300
Subject: lint fixes for planet

---
 modules/planet/manifests/init.pp            | 26 +++++++++++++-------------
 modules/planet/templates/planet_vhosts.conf |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'modules/planet')

diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index b9cfb29f..a5e930b5 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -7,8 +7,8 @@ class planet {
     }
 
     $vhost = "planet.$::domain"
-    $location = "/var/www/vhosts/$vhost"
-	
+    $location = "/var/www/vhosts/${vhost}"
+
     include apache::mod::php
     include apache::mod::deflate
 
@@ -17,7 +17,7 @@ class planet {
         content  => template('planet/planet_vhosts.conf')
     }
 
-    apache::vhost::base { "ssl_$vhost":
+    apache::vhost::base { "ssl_${vhost}":
         use_ssl  => true,
         vhost    => $vhost,
         location => $location,
@@ -32,27 +32,27 @@ class planet {
         ensure => directory,
     }
 
-    file { "$location/index.php":
+    file { "${location}/index.php":
         content => template('planet/index.php')
     }
 
-    package { ['php-iconv']: }    
+    package { ['php-iconv']: }
 
     class files_backup inherits base {
-        file { "/var/lib/planet/backup":
+        file { '/var/lib/planet/backup':
                 ensure => directory,
         }
 
-        mga_common::local_script { "backup_planet-files.sh":
-            content => template("blog/backup_planet-files.sh")
+        mga_common::local_script { 'backup_planet-files.sh':
+            content => template('blog/backup_planet-files.sh')
         }
 
         cron { "Backup files (planet)":
-            user => root,
-            hour => '23',
-            minute => '42',
-            command => "/usr/local/bin/backup_planet-files.sh",
-            require => [File["backup_planet-files"]],
+            user    => root,
+            hour    => '23',
+            minute  => '42',
+            command => '/usr/local/bin/backup_planet-files.sh',
+            require => [File['backup_planet-files']],
         }
     }
 }
diff --git a/modules/planet/templates/planet_vhosts.conf b/modules/planet/templates/planet_vhosts.conf
index 841e33cb..b3a07ab9 100644
--- a/modules/planet/templates/planet_vhosts.conf
+++ b/modules/planet/templates/planet_vhosts.conf
@@ -1,11 +1,11 @@
 <Directory <%= location %> >
-       Order deny,allow
+    Order deny,allow
        Allow from All
        AllowOverride All
-       Options FollowSymlinks	
+       Options FollowSymlinks
        Options +Indexes
 </Directory>
 # Add a permanent redirection for '/*' as '/en/' for english planet
 <IfModule mod_alias.c>
-	RedirectMatch permanent ^/?$ /en/
+       RedirectMatch permanent ^/?$ /en/
 </IfModule>
-- 
cgit v1.2.1