From 24aa153210c0c1fedbff72a23ca420294f9d9cb7 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Sat, 12 Feb 2011 14:03:27 +0000
Subject: - use variable for the blog domain and location (less stuff to change
   later )

---
 modules/blog/manifests/init.pp           | 7 +++++--
 modules/blog/templates/blogs_vhosts.conf | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'modules/blog')

diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index f444fa21..1b602b3a 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -30,11 +30,14 @@ class blog {
 
     include apache::mod_php
     include mysql
-    apache::vhost_other_app { "blog-test.$domain":
+
+    $blog_location = "/var/www/html/blog.$domain"
+    $blog_domain = "blog-test.$domain"
+    apache::vhost_other_app { "$blog_domain":
         vhost_file => "blog/blogs_vhosts.conf",
     }
 
-    file { "/var/www/html/blog.$domain":
+    file { "$blog_location":
 	    ensure => directory,
 	    owner => blog,
 	    # FIXME is the group created by puppet ?
diff --git a/modules/blog/templates/blogs_vhosts.conf b/modules/blog/templates/blogs_vhosts.conf
index dae15b40..86c2b7b7 100644
--- a/modules/blog/templates/blogs_vhosts.conf
+++ b/modules/blog/templates/blogs_vhosts.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
-ServerName blog-test.mageia.org
-DocumentRoot /var/www/html/blog.mageia.org/
-<Directory /var/www/html/blog.mageia.org/>
+ServerName <%= blog_domain %>
+DocumentRoot <%= blog_location %>
+<Directory <%= blog_location %> >
        Order deny,allow
        Allow from All
        AllowOverride All
-- 
cgit v1.2.1