use a loop to create config

TelekomLabs-DCO-1.1-Signed-off-by: Edmund Haselwanter <[email protected]> (github: ehaselwanter)

Author: ehaselwanter

Diff for: attributes/hardening.rb

@@ -26,28 +26,25 @@
 default['mysql']['security']['chroot']                  = nil
 
 # @see http://dev.mysql.com/doc/refman/5.7/en/server-options.html#option_mysqld_safe-user-create
-default['mysql']['security']['safe_user_create']        = 1
+default['mysql']['security']['safe-user-create']        = 1
 
 # @see http://dev.mysql.com/doc/refman/5.7/en/server-options.html#option_mysqld_secure-auth
-default['mysql']['security']['secure_auth']             = 1
+default['mysql']['security']['secure-auth']             = 1
 
 # @see http://dev.mysql.com/doc/refman/5.7/en/server-options.html#option_mysqld_symbolic-links
-default['mysql']['security']['skip_symbolic_links']     = 1
-
-# @see http://dev.mysql.com/doc/refman/5.7/en/server-options.html#option_mysqld_secure-file-priv
-default['mysql']['security']['secure_file_priv']        = nil
+default['mysql']['security']['skip-symbolic-links']     = 1
 
 # @see http://dev.mysql.com/doc/refman/5.7/en/server-options.html#option_mysqld_skip-show-database
-default['mysql']['security']['skip_show_database']      = 1
+default['mysql']['security']['skip-show-database']      = true
 
 # @see http://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_local_infile
-default['mysql']['security']['local_infile']            = 0
+default['mysql']['security']['local-infile']            = 0
 
 # @see https://dev.mysql.com/doc/refman/5.7/en/server-options.html#option_mysqld_allow-suspicious-udfs
 default['mysql']['security']['allow-suspicious-udfs']   = 0
 
 # @see https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_automatic_sp_privileges
-default['mysql']['security']['automatic_sp_privileges']   = 0
+default['mysql']['security']['automatic-sp-privileges']   = 0
 
 # @see https://dev.mysql.com/doc/refman/5.7/en/server-options.html#option_mysqld_secure-file-priv
 default['mysql']['security']['secure-file-priv']        = '/tmp'

Diff for: templates/default/hardening.cnf.erb

@@ -1,39 +1,9 @@
-<% if node['mysql']['security']['chroot'] -%>
-chroot = <%= node['mysql']['security']['chroot'] %>
-<% end %>
-
-<% if node['mysql']['security']['safe_user_create'] -%>
-safe-user-create = <%= node['mysql']['security']['safe_user_create'] %>
-<% end %>
-
-<% if node['mysql']['security']['secure_auth'] -%>
-secure-auth = <%= node['mysql']['security']['secure_auth'] %>
-<% end %>
-
-<% if node['mysql']['security']['skip_symbolic_links'] -%>
-skip-symbolic-links = <%= node['mysql']['security']['skip_symbolic_links'] %>
-<% end %>
-
-<% if node['mysql']['security']['secure_file_priv'] -%>
-secure-file-priv = <%= node['mysql']['security']['secure_file_priv'] %>
-<% end %>
-
-<% if node['mysql']['security']['local_infile'] -%>
-local-infile = <%= node['mysql']['security']['local_infile'] %>
-<% end %>
-
-<% if node['mysql']['security']['skip_show_database'] -%>
-skip-show-database
-<% end %>
-
-<% if node['mysql']['security']['allow-suspicious-udfs'] -%>
-allow-suspicious-udfs = <%= node['mysql']['security']['allow-suspicious-udfs'] %>
-<% end %>
+[mysqld]
 
-<% if node['mysql']['security']['automatic_sp_privileges'] -%>
-automatic_sp_privileges = <%= node['mysql']['security']['automatic_sp_privileges'] %>
+<% node['mysql']['security'].each do |sec_setting, value| -%>
+  <% if value && (!!value == value) # We do have a value and it is a boolean -%>
+<%= sec_setting if value %>
+  <% else -%>
+<%= "#{sec_setting} = #{value}" if value  %>
+  <% end %>
 <% end %>
-
-<% if node['mysql']['security']['secure-file-priv'] -%>
-secure-file-priv = <%= node['mysql']['security']['secure-file-priv'] %>
-<% end %>