aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-04-08 14:58:10 +0000
committerNicolas Vigier <boklm@mageia.org>2011-04-08 14:58:10 +0000
commita9c82b0f2471e9794026374ae73a5d1f6f7311de (patch)
tree7e7ae1e4cd38b72d1ac33d79f1af64f94c703c6e /modules
parentc300bc8a393e37090781bf817a865ddfecbca7d1 (diff)
downloadpuppet-a9c82b0f2471e9794026374ae73a5d1f6f7311de.tar
puppet-a9c82b0f2471e9794026374ae73a5d1f6f7311de.tar.gz
puppet-a9c82b0f2471e9794026374ae73a5d1f6f7311de.tar.bz2
puppet-a9c82b0f2471e9794026374ae73a5d1f6f7311de.tar.xz
puppet-a9c82b0f2471e9794026374ae73a5d1f6f7311de.zip
set php date.timezone to UTC (as CEST is an incorrect value)
Diffstat (limited to 'modules')
-rw-r--r--modules/apache/manifests/init.pp2
-rw-r--r--modules/apache/templates/mod_php.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index 5a117e8a..8f9a862b 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -1,6 +1,8 @@
class apache {
class base {
+ php_date_timezone = "UTC"
+
package { "apache-mpm-prefork":
alias => apache,
ensure => installed
diff --git a/modules/apache/templates/mod_php.conf b/modules/apache/templates/mod_php.conf
index a92a99f6..6c0f20d4 100644
--- a/modules/apache/templates/mod_php.conf
+++ b/modules/apache/templates/mod_php.conf
@@ -1,5 +1,5 @@
# as php insist to have this value set, let's
# look on the system for him
-php_value date.timezone "<%= timezone %>"
+php_value date.timezone "<%= php_date_timezone %>"
php_value sendmail_path "/usr/sbin/sendmail -t -i -f root@<%= domain %>"