aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-04-07 23:13:43 +0000
committerNicolas Vigier <boklm@mageia.org>2011-04-07 23:13:43 +0000
commit3b02628689530ee95e4e54802b36e9a649e54913 (patch)
tree318fc542ac592108704c9927f5c4ad535f9aabc2
parente10aaf397922a86dfbf6dcb6628e55d41c24e95c (diff)
downloadpuppet-3b02628689530ee95e4e54802b36e9a649e54913.tar
puppet-3b02628689530ee95e4e54802b36e9a649e54913.tar.gz
puppet-3b02628689530ee95e4e54802b36e9a649e54913.tar.bz2
puppet-3b02628689530ee95e4e54802b36e9a649e54913.tar.xz
puppet-3b02628689530ee95e4e54802b36e9a649e54913.zip
set timezone it php.ini
-rw-r--r--modules/php/manifests/init.pp1
-rw-r--r--modules/php/templates/php.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/php/manifests/init.pp b/modules/php/manifests/init.pp
index 56477df1..3d8b00fd 100644
--- a/modules/php/manifests/init.pp
+++ b/modules/php/manifests/init.pp
@@ -1,6 +1,7 @@
class php {
class base {
$php_sender_email = "root@$domain"
+ $php_date_timezone = "UTC"
package {"php-ini":
ensure => installed,
diff --git a/modules/php/templates/php.ini b/modules/php/templates/php.ini
index b1e01c53..e4f2f1e0 100644
--- a/modules/php/templates/php.ini
+++ b/modules/php/templates/php.ini
@@ -932,7 +932,7 @@ default_socket_timeout = 60
[Date]
; Defines the default timezone used by the date functions
; http://php.net/date.timezone
-;date.timezone =
+date.timezone = <%= php_date_timezone %>
; http://php.net/date.default-latitude
;date.default_latitude = 31.7667