Merge pull request #150 from erinn/master

Enable logging
sous-chefs · Mar 20, 2017 · 67b8ad8 · 67b8ad8
2 parents f9d639b + 911b692
commit 67b8ad8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -194,3 +194,4 @@
 # Syslog(require server_audit_output_type = syslog)
 default['mariadb']['audit_plugin']['server_audit_syslog_facility'] = 'LOG_USER'
 default['mariadb']['audit_plugin']['server_audit_syslog_priority'] = 'LOG_INFO'
+default['mariadb']['audit_plugin']['server_audit_logging'] = 'OFF'
diff --git a/recipes/_audit_plugin.rb b/recipes/_audit_plugin.rb
@@ -13,21 +13,26 @@
   node['mariadb']['audit_plugin']['server_audit_syslog_facility']
 audit_plugin_options['server_audit_syslog_priority'] = \
   node['mariadb']['audit_plugin']['server_audit_syslog_priority']
-
-audit_plugin_options['enable'] = '#server_audit_logging = ON'
+audit_plugin_options['server_audit_logging'] = \
+  node['mariadb']['audit_plugin']['server_audit_logging']
 
 # Install the MariaDB Audit Plugin
 mysql_cmd = mysqlbin_cmd(node['mariadb']['install']['prefer_scl_package'],
                          node['mariadb']['install']['version'],
                          'mysql')
 execute 'install_mariadb_audit_plugin' do
-  command "#{mysql_cmd} -e \"INSTALL PLUGIN server_audit "\
-          "SONAME 'server_audit';\""
+  command "#{mysql_cmd} -u root --password=" + \
+          node['mariadb']['server_root_password'] + \
+          " -e \"INSTALL PLUGIN server_audit SONAME 'server_audit';\""
   notifies :run, 'execute[configure_mariadb_audit_plugin]', :immediately
+  sensitive true
   not_if do
-    cmd = Mixlib::ShellOut.new("#{mysql_cmd} -u root -B -N -e \"SELECT 1 "\
-                               'FROM information_schema.plugins '\
-                               "WHERE PLUGIN_NAME = 'SERVER_AUDIT'"\
+    cmd = Mixlib::ShellOut.new("#{mysql_cmd} -u root " \
+                               '--password=' + \
+                               node['mariadb']['server_root_password'] + \
+                               ' -B -N -e "SELECT 1 ' \
+                               'FROM information_schema.plugins ' \
+                               "WHERE PLUGIN_NAME = 'SERVER_AUDIT'" \
                                "AND PLUGIN_STATUS = 'ACTIVE';\"")
     cmd.run_command
     cmd.stdout.to_i == 1
@@ -43,7 +48,9 @@
     'SET GLOBAL server_audit_syslog_facility=\'' + \
     node['mariadb']['audit_plugin']['server_audit_syslog_facility'] + '\';' \
     'SET GLOBAL server_audit_syslog_priority=\'' + \
-    node['mariadb']['audit_plugin']['server_audit_syslog_priority'] + '\';"' \
+    node['mariadb']['audit_plugin']['server_audit_syslog_priority'] + '\';' \
+    'SET GLOBAL server_audit_logging=\'' + \
+    node['mariadb']['audit_plugin']['server_audit_logging'] + '\';" ' \
     "| #{mysql_cmd}"
   action :nothing
 end