diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-15 15:56:38 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-15 15:56:38 +0000 |
| commit | 3f7b286a3b5e190b6ba7f57e52ebca51996e6890 (patch) | |
| tree | 2c805ec0a1c7f0d58bc802cedf08bf7ff3d62073 /modules | |
| parent | 86d6fae4a0b329ddc1ad19dc6f5c3f1d183707da (diff) | |
| download | puppet-3f7b286a3b5e190b6ba7f57e52ebca51996e6890.tar puppet-3f7b286a3b5e190b6ba7f57e52ebca51996e6890.tar.gz puppet-3f7b286a3b5e190b6ba7f57e52ebca51996e6890.tar.bz2 puppet-3f7b286a3b5e190b6ba7f57e52ebca51996e6890.tar.xz puppet-3f7b286a3b5e190b6ba7f57e52ebca51996e6890.zip | |
split phpbb::config in a separate file to please puppet-lint
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/phpbb/manifests/config.pp | 12 | ||||
| -rw-r--r-- | modules/phpbb/manifests/init.pp | 15 |
2 files changed, 13 insertions, 14 deletions
diff --git a/modules/phpbb/manifests/config.pp b/modules/phpbb/manifests/config.pp new file mode 100644 index 00000000..52bd5419 --- /dev/null +++ b/modules/phpbb/manifests/config.pp @@ -0,0 +1,12 @@ +define phpbb::config($key, $value, $database) { + exec { "phpbb_apply $name": + command => "/usr/local/bin/phpbb_apply_config.pl $key", + user => 'root', + environment => ["PGDATABASE=$database", + "PGUSER=$phpbb::base::user", + "PGPASSWORD=$phpbb::base::pgsql_password", + "PGHOST=pgsql.$::domain", + "VALUE=$value"], + require => File['/usr/local/bin/phpbb_apply_config.pl'], + } +} diff --git a/modules/phpbb/manifests/init.pp b/modules/phpbb/manifests/init.pp index fd85d904..90248384 100644 --- a/modules/phpbb/manifests/init.pp +++ b/modules/phpbb/manifests/init.pp @@ -1,18 +1,5 @@ class phpbb { - define config($key, $value, $database) { - exec { "phpbb_apply $name": - command => "/usr/local/bin/phpbb_apply_config.pl $key", - user => root, - environment => ["PGDATABASE=$database", - "PGUSER=$phpbb::base::user", - "PGPASSWORD=$phpbb::base::pgsql_password", - "PGHOST=pgsql.$domain", - "VALUE=$value"], - require => File["/usr/local/bin/phpbb_apply_config.pl"], - } - } - - define redirection_instance($url) { + define redirection_instance($url) { $lang = $name file { "/etc/httpd/conf/vhosts.d/forums.d/redirect_$name.conf": content => template("phpbb/forums_redirect.conf"), |