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

Php without mysql #84

Closed
typhonius wants to merge 2 commits into from
Closed

Php without mysql #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
844d97d
Moves the inclusion of mysql into the project manifest
typhonius Feb 4, 2016
ad94685
Preventing mysql from being put into the templates
typhonius Feb 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifests/project.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
}

if $mysql {
include mysql::config
$mysql_dbs = $mysql ? {
true => ["${name}_development", "${name}_test"],
default => $mysql,
Expand Down
1 change: 0 additions & 1 deletion manifests/version.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
$version = $name
) {
require php
include mysql::config

# Current supported and secure versions
$secure_5_6 = $php::config::secure_versions['5.6']
Expand Down
4 changes: 4 additions & 0 deletions templates/php.ini.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1005,6 +1005,7 @@ date.timezone = UTC

;pdo_odbc.db2_instance_name

<% if @mysql %>
[Pdo_mysql]
; If mysqlnd is used: Number of cache slots for the internal result set cache
; http://php.net/pdo_mysql.cache_size
Expand All @@ -1014,6 +1015,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 -%>

[Phar]
; http://php.net/phar.readonly
Expand Down Expand Up @@ -1136,6 +1138,7 @@ 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
; http://php.net/mysql.allow_local_infile
Expand Down Expand Up @@ -1266,6 +1269,7 @@ mysqlnd.collect_memory_statistics = Off
; bytes.
; http://php.net/mysqlnd.net_read_buffer_size
;mysqlnd.net_read_buffer_size = 32768
<% end -%>

[OCI8]

Expand Down