diff options
| author | Michael Scherer <misc@mageia.org> | 2011-02-23 17:14:31 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-02-23 17:14:31 +0000 |
| commit | 87ca7e0838341479e913ff31ff8a0ca808621a4a (patch) | |
| tree | 2c896c515a00813d64248e08af16070b47d02614 | |
| parent | 0f0f987a310f673d1d0ac3cfa103aa2318104eec (diff) | |
| download | puppet-87ca7e0838341479e913ff31ff8a0ca808621a4a.tar puppet-87ca7e0838341479e913ff31ff8a0ca808621a4a.tar.gz puppet-87ca7e0838341479e913ff31ff8a0ca808621a4a.tar.bz2 puppet-87ca7e0838341479e913ff31ff8a0ca808621a4a.tar.xz puppet-87ca7e0838341479e913ff31ff8a0ca808621a4a.zip | |
- php complain when the timezone is not set, and do not seem
to be able to guess it from system setup. It is set in apache
config as this is easier to do ( alternative is to use augeas to modify
php.ini, would require more work on our servers )
| -rw-r--r-- | modules/apache/manifests/init.pp | 9 | ||||
| -rw-r--r-- | modules/apache/templates/mod_php.conf | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index d4038afe..3ee7b91d 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -43,6 +43,15 @@ class apache { package { "apache-mod_php": ensure => installed } + + file { "/etc/httpd/conf.d/mod_php.conf": + ensure => present, + owner => root, + group => root, + mode => 644, + require => Package['apache-conf'], + content => template('apache/mod_php.conf') + } } class mod_perl inherits base { diff --git a/modules/apache/templates/mod_php.conf b/modules/apache/templates/mod_php.conf new file mode 100644 index 00000000..492d4bba --- /dev/null +++ b/modules/apache/templates/mod_php.conf @@ -0,0 +1,4 @@ +# as php insist to have this value set, let's +# look on the system for him +php_value date.timezone "<%= timezone %>" + |