diff options
| author | Michael Scherer <misc@mageia.org> | 2011-02-21 15:14:52 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-02-21 15:14:52 +0000 |
| commit | f174461bc32e55c41a8d3a41d02a1fa9511290c2 (patch) | |
| tree | d8f7474d6fe6b637550e0a29a9ea16d9cf650d6d /modules/phpbb | |
| parent | fae5291173019477eb530eacdff27b64e9216b8a (diff) | |
| download | puppet-f174461bc32e55c41a8d3a41d02a1fa9511290c2.tar puppet-f174461bc32e55c41a8d3a41d02a1fa9511290c2.tar.gz puppet-f174461bc32e55c41a8d3a41d02a1fa9511290c2.tar.bz2 puppet-f174461bc32e55c41a8d3a41d02a1fa9511290c2.tar.xz puppet-f174461bc32e55c41a8d3a41d02a1fa9511290c2.zip | |
rename the php_instance class, as it is already scoped in phpbb module
Diffstat (limited to 'modules/phpbb')
| -rw-r--r-- | modules/phpbb/manifests/init.pp | 8 |
1 files changed, 5 insertions, 3 deletions
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 |