Showing
4 changed files
with
12 additions
and
10 deletions
@@ -26,8 +26,8 @@ | @@ -26,8 +26,8 @@ | ||
26 | # :bak_filename => 'example_db_name.sql', | 26 | # :bak_filename => 'example_db_name.sql', |
27 | # :bak_maxcopies => 30 | 27 | # :bak_maxcopies => 30 |
28 | ## Optional: | 28 | ## Optional: |
29 | -# :char_set => 'latin1', | ||
30 | -# :collate => 'latin1_swedish_ci', | 29 | +# :char_set => 'utf8', |
30 | +# :collate => 'utf8_general_ci', | ||
31 | # :bak_encrypted => false | 31 | # :bak_encrypted => false |
32 | # } | 32 | # } |
33 | # } | 33 | # } |
@@ -4,7 +4,7 @@ maintainer_email 'sysadmin @ chromedia.com' | @@ -4,7 +4,7 @@ maintainer_email 'sysadmin @ chromedia.com' | ||
4 | license 'Apache License' | 4 | license 'Apache License' |
5 | description 'Simplifies setup of MariaDB in Chromedia.' | 5 | description 'Simplifies setup of MariaDB in Chromedia.' |
6 | long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) | 6 | long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) |
7 | -version '0.3.0' | 7 | +version '0.3.1' |
8 | 8 | ||
9 | { | 9 | { |
10 | 'mariadb' => '0.3.1', | 10 | 'mariadb' => '0.3.1', |
@@ -40,15 +40,13 @@ node['cfe-mariadb']['db_map'].each do |dbx| | @@ -40,15 +40,13 @@ node['cfe-mariadb']['db_map'].each do |dbx| | ||
40 | dbx_name = dbx[:db_name] | 40 | dbx_name = dbx[:db_name] |
41 | end | 41 | end |
42 | 42 | ||
43 | + dbencoding = dbx[:char_set] || 'utf8' | ||
44 | + dbcollate = dbx[:collate] || 'utf8_general_ci' | ||
43 | mysql_database dbx_name do | 45 | mysql_database dbx_name do |
44 | connection con | 46 | connection con |
45 | - action :create | ||
46 | - if dbx.has_key?(:char_set) | ||
47 | - encoding dbx[:char_set] | ||
48 | - end | ||
49 | - if dbx.has_key?(:collate) | ||
50 | - collation dbx[:collate] | ||
51 | - end | 47 | + action :create |
48 | + encoding dbencoding | ||
49 | + collation dbcollate | ||
52 | end | 50 | end |
53 | 51 | ||
54 | mysql_database_user dbx[:db_user] do | 52 | mysql_database_user dbx[:db_user] do |