aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-04-08 14:46:46 +0000
committerNicolas Vigier <boklm@mageia.org>2011-04-08 14:46:46 +0000
commit0d9a0ecde32be4af32b1060ccfde10c362b9eca1 (patch)
tree57f3c336149844442f7f711a4c844fe045a45e20 /modules
parent6ebb35a1b526ea8082a82b12e9c3dd963a5ff456 (diff)
downloadpuppet-0d9a0ecde32be4af32b1060ccfde10c362b9eca1.tar
puppet-0d9a0ecde32be4af32b1060ccfde10c362b9eca1.tar.gz
puppet-0d9a0ecde32be4af32b1060ccfde10c362b9eca1.tar.bz2
puppet-0d9a0ecde32be4af32b1060ccfde10c362b9eca1.tar.xz
puppet-0d9a0ecde32be4af32b1060ccfde10c362b9eca1.zip
reset php.ini to default, as we should be doing all changes using apache config
Diffstat (limited to 'modules')
-rw-r--r--modules/php/templates/php.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/php/templates/php.ini b/modules/php/templates/php.ini
index e4f2f1e0..8bfe560c 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 = <%= php_date_timezone %>
+;date.timezone =
; http://php.net/date.default-latitude
;date.default_latitude = 31.7667
@@ -1030,7 +1030,7 @@ smtp_port = 25
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
; http://php.net/sendmail-path
-sendmail_path = /usr/sbin/sendmail -t -i -f <%= php_sender_email %>
+;sendmail_path =
; Force the addition of the specified parameters to be passed as extra parameters
; to the sendmail binary. These parameters will always replace the value of