diff options
| author | Michael Scherer <misc@mageia.org> | 2011-02-21 15:14:53 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-02-21 15:14:53 +0000 |
| commit | 05a804b100347450c99a777e17c5bd02ab002c52 (patch) | |
| tree | 03860d31b3259938223f977d3d3f1aee04b38a33 | |
| parent | f174461bc32e55c41a8d3a41d02a1fa9511290c2 (diff) | |
| download | puppet-05a804b100347450c99a777e17c5bd02ab002c52.tar puppet-05a804b100347450c99a777e17c5bd02ab002c52.tar.gz puppet-05a804b100347450c99a777e17c5bd02ab002c52.tar.bz2 puppet-05a804b100347450c99a777e17c5bd02ab002c52.tar.xz puppet-05a804b100347450c99a777e17c5bd02ab002c52.zip | |
move phpbb_config outside of phpbb::base
| -rw-r--r-- | modules/phpbb/manifests/init.pp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/modules/phpbb/manifests/init.pp b/modules/phpbb/manifests/init.pp index 13cbeb95..d35056b9 100644 --- a/modules/phpbb/manifests/init.pp +++ b/modules/phpbb/manifests/init.pp @@ -26,14 +26,6 @@ class phpbb { # cookie_domain # board_contact # - define phpbb_config($value) { - exec { "/usr/local/bin/phpbb_apply_config.pl $name": - user => root, - environment => ["PGDATABASE=$database", "PGUSER=$user", "PGPASSWORD=$pgsql_password", "PGHOST=pgsql.$domain", "VALUE=$value"], - require => File["/usr/local/bin/phpbb_apply_config.pl"], - } - } - $pgsql_password = extlookup("phpbb_pgsql",'x') @@postgresql::user { $user: password => $pgsql_password, @@ -47,6 +39,17 @@ class phpbb { } } + define phpbb_config($value) { + exec { "/usr/local/bin/phpbb_apply_config.pl $name": + user => root, + environment => ["PGDATABASE=$phpbb::base::database", + "PGUSER=$phpbb::base::user", + "PGPASSWORD=$phpbb::base::pgsql_password", + "PGHOST=pgsql.$domain", + "VALUE=$value"], + require => File["/usr/local/bin/phpbb_apply_config.pl"], + } + } # TODO find a way to avoid all the phpbb::base prefix define instance() { |