From 6e33a0f611cf84852df0df4b1b8c8a2af7378014 Mon Sep 17 00:00:00 2001
From: Damien Lallement <dams@mageia.org>
Date: Wed, 16 Feb 2011 01:23:38 +0000
Subject: update to fit with puppet rules explained by misc

---
 modules/planet/manifests/init.pp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index bf46b436..7d9c7786 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -1,15 +1,21 @@
 class planet {
+
     user { "planet":
 	groups => apache,
 	comment => "User running cronjob and deploying planet software",
 	ensure => present,
 	managehome => true,
+	home => "/var/lib/planet",
     }
 
+    $planet_location = "/var/www/html/planet.$domain"
+    $planet_domain = "planet.$domain"
+	
     include apache::mod_php
     include apache::mod_deflate
-    apache::vhost_other_app { "planet.$domain":
-        vhost_file => "planet/02_planet_vhosts.conf",
+    apache::vhost_base { "$planet_domain":
+	location => $planet_location,
+        content => template('planet/02_planet_vhosts.conf')
     }
 
     file { "/var/www/html/planet.$domain":
-- 
cgit v1.2.1