Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MariaDB Support #41

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

MariaDB Support #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b7e7dd
Test version
mizhgun Mar 3, 2015
6b3e26c
Added with-mysql-includes
mizhgun Mar 3, 2015
be94c8b
Final version
mizhgun Mar 3, 2015
976f0ca
Fixed formatting
mizhgun Mar 4, 2015
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 attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
default[:sphinx][:use_stemmer] = false
default[:sphinx][:use_mysql] = false
default[:sphinx][:use_percona] = false
default[:sphinx][:use_mariadb] = false
default[:sphinx][:use_postgres] = false

# Source Installation Settings
Expand Down
1 change: 1 addition & 0 deletions recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include_recipe "percona::client" if node[:sphinx][:use_percona]
include_recipe "mysql::client" if node[:sphinx][:use_mysql]
include_recipe "mariadb::client" if node[:sphinx][:use_mariadb]
include_recipe "postgresql::client" if node[:sphinx][:use_postgres]
include_recipe "sphinx::#{node[:sphinx][:install_method]}"
6 changes: 3 additions & 3 deletions recipes/source.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
end

# Install required dependency when building from source
# against Percona server
if node[:sphinx][:use_percona]
# against Percona and MariaDB servers
if (node[:sphinx][:use_percona] or node[:sphinx][:use_mariadb])
case node[:platform_family]
when 'debian'
package 'libssl-dev'
Expand Down Expand Up @@ -58,7 +58,7 @@
"--prefix=#{node[:sphinx][:source][:install_path]}",
"--bindir=#{node[:sphinx][:source][:binary_path]}",
node[:sphinx][:use_stemmer] ? '--with-libstemmer' : '--without-libstemmer',
(node[:sphinx][:use_mysql] or node[:sphinx][:use_percona]) ? '--with-mysql' : '--without-mysql',
(node[:sphinx][:use_mysql] or node[:sphinx][:use_percona] or node[:sphinx][:use_mariadb]) ? '--with-mysql' : '--without-mysql',
node[:sphinx][:use_postgres] ? '--with-pgsql' : '--without-pgsql'
]
end
Expand Down