aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-01-08 23:49:30 +0000
committerMichael Scherer <misc@mageia.org>2012-01-08 23:49:30 +0000
commit6ce54edd111dd85c40060352fdc895b1fcb583fb (patch)
treecaa507cf0a4309ebc2f690a5d5a9ce2f6f9c93c1 /modules
parent9d117d9e8b1b951a644b28bcc5cff6346cfe9bf0 (diff)
downloadpuppet-6ce54edd111dd85c40060352fdc895b1fcb583fb.tar
puppet-6ce54edd111dd85c40060352fdc895b1fcb583fb.tar.gz
puppet-6ce54edd111dd85c40060352fdc895b1fcb583fb.tar.bz2
puppet-6ce54edd111dd85c40060352fdc895b1fcb583fb.tar.xz
puppet-6ce54edd111dd85c40060352fdc895b1fcb583fb.zip
clean phpbb module a little bit
Diffstat (limited to 'modules')
-rw-r--r--modules/phpbb/manifests/init.pp23
1 files changed, 2 insertions, 21 deletions
diff --git a/modules/phpbb/manifests/init.pp b/modules/phpbb/manifests/init.pp
index b1bb1835..09edff1a 100644
--- a/modules/phpbb/manifests/init.pp
+++ b/modules/phpbb/manifests/init.pp
@@ -12,18 +12,11 @@ class phpbb {
"php-apc",
"php-magickwand",
"php-pgsql",
- "php-ldap", ] :
- ensure => installed
- }
+ "php-ldap", ] : }
- package { "perl-DBD-Pg":
- ensure => installed
- }
+ package { "perl-DBD-Pg": }
file { "/usr/local/bin/phpbb_apply_config.pl":
- ensure => present,
- owner => root,
- group => root,
mode => 755,
source => 'puppet:///modules/phpbb/phpbb_apply_config.pl',
}
@@ -36,8 +29,6 @@ class phpbb {
$forums_dir = "/var/www/forums/"
file { "$forums_dir":
ensure => directory,
- owner => root,
- group => root,
}
# TODO add a ssl counterpart
# TODO check that everything is locked down
@@ -73,10 +64,6 @@ class phpbb {
define redirection_instance($url) {
$lang = $name
file { "/etc/httpd/conf/vhosts.d/forums.d/redirect_$name.conf":
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
content => template("phpbb/forums_redirect.conf"),
notify => Service['apache'],
}
@@ -139,16 +126,10 @@ class phpbb {
file { $dir_names:
ensure => directory,
owner => apache,
- group => root,
- mode => 755,
require => Exec["git_clone $lang"],
}
file { "$forums_dir/$lang/phpBB/config.php":
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
content => template("phpbb/config.php"),
}