From 86ed741826a8a2f4bdd738cf35c96021927dc85b Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Mon, 2 Apr 2012 11:24:40 +0000
Subject: fix some puppet-lint warning

---
 modules/planet/manifests/init.pp | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'modules/planet/manifests/init.pp')

diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index 14930899..81abb0e2 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -1,37 +1,37 @@
 class planet {
 
-    user { "planet":
-        groups => apache,
-        comment => "Planet Mageia",
-        home => "/var/lib/planet",
+    user { 'planet':
+        groups  => 'apache',
+        comment => 'Planet Mageia',
+        home    => '/var/lib/planet',
     }
 
-    $location = "/var/www/vhosts/planet.$domain"
-    $vhost = "planet.$domain"
+    $vhost = "planet.$::domain"
+    $location = "/var/www/vhosts/$vhost"
 	
     include apache::mod::php
     include apache::mod::deflate
 
-    apache::vhost::base { "$vhost":
+    apache::vhost::base { $vhost:
         location => $location,
-        content => template('planet/planet_vhosts.conf')
+        content  => template('planet/planet_vhosts.conf')
     }
 
-    local_script { "deploy_new-planet.sh":
-        content => template("planet/deploy_new-planet.sh")
+    local_script { 'deploy_new-planet.sh':
+        content => template('planet/deploy_new-planet.sh')
     }
 
-    file { "$location":
+    file { $location:
         ensure => directory,
-        owner => planet,
-        group => apache,
+        owner  => 'planet',
+        group  => 'apache',
     }
 
     file { "$location/index.php":
-        owner => planet,
-        group => apache,
-        mode => 755,
-        content => template("planet/index.php")
+        owner   => 'planet',
+        group   => 'apache',
+        mode    => '0755',
+        content => template('planet/index.php')
     }
 
     package { ['php-iconv']: }    
-- 
cgit v1.2.1