From f174461bc32e55c41a8d3a41d02a1fa9511290c2 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Mon, 21 Feb 2011 15:14:52 +0000
Subject: rename the php_instance class, as it is already scoped in phpbb
 module

---
 modules/phpbb/manifests/init.pp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'modules/phpbb/manifests')

diff --git a/modules/phpbb/manifests/init.pp b/modules/phpbb/manifests/init.pp
index ea65e917..13cbeb95 100644
--- a/modules/phpbb/manifests/init.pp
+++ b/modules/phpbb/manifests/init.pp
@@ -47,10 +47,12 @@ class phpbb {
         }
     }
 
-    define php_instance() {
-        $lang = $name
-        $database = "${db}_$lang"
 
+    # TODO find a way to avoid all the phpbb::base prefix
+    define instance() {
+        $lang = $name
+        $database = "${phpbb::base::db}_$lang"
+        
         include git::client
         include phpbb::base
 
-- 
cgit v1.2.1