diff options
| author | Michael Scherer <misc@mageia.org> | 2012-03-25 12:20:32 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-03-25 12:20:32 +0000 |
| commit | 347cdaaa92ae792de39cdf2692c1564e412f698b (patch) | |
| tree | 3bf115eb01334bf96624ea0041977f547fba278f | |
| parent | da6aa985e557b6541f1370cc172b2683101a6931 (diff) | |
| download | puppet-347cdaaa92ae792de39cdf2692c1564e412f698b.tar puppet-347cdaaa92ae792de39cdf2692c1564e412f698b.tar.gz puppet-347cdaaa92ae792de39cdf2692c1564e412f698b.tar.bz2 puppet-347cdaaa92ae792de39cdf2692c1564e412f698b.tar.xz puppet-347cdaaa92ae792de39cdf2692c1564e412f698b.zip | |
use the new name for mod_php module
| -rw-r--r-- | deployment/websites/manifests/www.pp | 2 | ||||
| -rw-r--r-- | modules/blog/manifests/init.pp | 2 | ||||
| -rw-r--r-- | modules/mediawiki/manifests/base.pp | 2 | ||||
| -rw-r--r-- | modules/phpbb/manifests/base.pp | 2 | ||||
| -rw-r--r-- | modules/planet/manifests/init.pp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp index f5b25883..a2ce89f4 100644 --- a/deployment/websites/manifests/www.pp +++ b/deployment/websites/manifests/www.pp @@ -4,7 +4,7 @@ class websites::www { $vhostdir = "$websites::base::webdatadir/$vhost" $svn_location = "svn://svn.$::domain/svn/web/www/trunk" - include apache::mod_php + include apache::mod::php include apache::mod::geoip # for mailman reverse proxy, on ssl diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index b6adecf2..647ea769 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -29,7 +29,7 @@ class blog { require => Local_script['check_new-blog-post.sh'], } - include apache::mod_php + include apache::mod::php apache::vhost_base { "$blog_domain": location => $blog_location, diff --git a/modules/mediawiki/manifests/base.pp b/modules/mediawiki/manifests/base.pp index bcc654af..45847235 100644 --- a/modules/mediawiki/manifests/base.pp +++ b/modules/mediawiki/manifests/base.pp @@ -1,5 +1,5 @@ class mediawiki::base { - include apache::mod_php + include apache::mod::php $vhost = $mediawiki::config::vhost $root = $mediawiki::config::root diff --git a/modules/phpbb/manifests/base.pp b/modules/phpbb/manifests/base.pp index 6765fb43..e165679f 100644 --- a/modules/phpbb/manifests/base.pp +++ b/modules/phpbb/manifests/base.pp @@ -3,7 +3,7 @@ class phpbb::base { $user = 'phpbb' $forums_dir = '/var/www/forums/' - include apache::mod_php + include apache::mod::php package {['php-gd', 'php-xml', diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp index 3951e10d..9b047a4d 100644 --- a/modules/planet/manifests/init.pp +++ b/modules/planet/manifests/init.pp @@ -9,7 +9,7 @@ class planet { $location = "/var/www/vhosts/planet.$domain" $vhost = "planet.$domain" - include apache::mod_php + include apache::mod::php include apache::mod::deflate apache::vhost_base { "$vhost": |