Skip to content
This repository has been archived by the owner on Dec 2, 2020. It is now read-only.

Commit

Permalink
Removes mysql::config from present classes as before
Browse files Browse the repository at this point in the history
  • Loading branch information
typhonius committed May 11, 2017
1 parent eb249f4 commit bc132fa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion spec/defines/php_project_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@
end

it do
should contain_class("mysql::config")
should contain_mysql__db("a_database_name")

should contain_file("/test/boxen/config/php/5.4.17/php.ini").with({
Expand Down
6 changes: 2 additions & 4 deletions templates/php.ini.erb
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,6 @@ date.timezone = UTC
;pdo_odbc.connection_pooling=strict

;pdo_odbc.db2_instance_name

<% if @mysql %>
[Pdo_mysql]
; If mysqlnd is used: Number of cache slots for the internal result set cache
Expand All @@ -1015,7 +1014,7 @@ pdo_mysql.cache_size = 2000
; MySQL defaults.
; http://php.net/pdo_mysql.default-socket
pdo_mysql.default_socket=<%= scope.lookupvar('::mysql::config::socket') %>
<% end -%>
<% end %>
[Phar]
; http://php.net/phar.readonly
;phar.readonly = On
Expand Down Expand Up @@ -1136,7 +1135,6 @@ ibase.dateformat = "%Y-%m-%d"

; Default time format.
ibase.timeformat = "%H:%M:%S"

<% if @mysql %>
[MySQL]
; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
Expand Down Expand Up @@ -1268,7 +1266,7 @@ mysqlnd.collect_memory_statistics = Off
; bytes.
; http://php.net/mysqlnd.net_read_buffer_size
;mysqlnd.net_read_buffer_size = 32768
<% end -%>
<% end %>
[OCI8]

; Connection: Enables privileged connections using external
Expand Down

0 comments on commit bc132fa

Please sign in to comment.