Allow piwik to use LOAD DATA INFILE for improved performance

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index d0d7b1679230c2448f0d7278c9207913923cf7ea..00334af00216a28dea52ee3aa154c5d2c3c9b2c4 100644 (file)
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -36,6 +36,18 @@ template "/etc/mysql/mysql.conf.d/zzz-chef.cnf" do
   notifies :restart, "service[mysql]"
 end
 
+service "apparmor" do
+  action :nothing
+end
+
+template "/etc/apparmor.d/local/usr.sbin.mysqld" do
+  source "apparmor.erb"
+  owner "root"
+  group "root"
+  mode "644"
+  notifies :restart, "service[apparmor]"
+end
+
 package "libdbd-mysql-perl"
 package "libcache-cache-perl"
 

diff --git a/cookbooks/mysql/templates/default/apparmor.erb b/cookbooks/mysql/templates/default/apparmor.erb
new file mode 100644 (file)
index 0000000..1a0f657
--- /dev/null
+++ b/cookbooks/mysql/templates/default/apparmor.erb
@@ -0,0 +1,4 @@
+# DO NOT EDIT - This file is being maintained by Chef
+<% if node[:mysql][:settings][:mysqld][:secure_file_priv] -%>
+<%= node[:mysql][:settings][:mysqld][:secure_file_priv] %>/* rw,
+<% end -%>

diff --git a/cookbooks/piwik/attributes/default.rb b/cookbooks/piwik/attributes/default.rb
index 5597d454c3e4b5fcfb52a51e67c749c78e29984e..2470bddcc8308dcc15db764be3f0afc06cf40156 100644 (file)
--- a/cookbooks/piwik/attributes/default.rb
+++ b/cookbooks/piwik/attributes/default.rb
@@ -12,3 +12,5 @@ default[:piwik][:plugins] = %w[
   VisitFrequency VisitorInterest VisitsSummary VisitTime WebsiteMeasurable
   Widgetize
 ]
+
+default[:mysql][:settings][:mysqld][:secure_file_priv] = "/opt/piwik-#{node[:piwik][:version]}/piwik/tmp/assets"

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 997048308f49b45a2ae5cba47f65144925da005d..b2a27737ad4872a2f6a35db11d2415d1b0109e0d 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -88,6 +88,12 @@ directory "/opt/piwik-#{version}/piwik/tmp" do
   mode "0755"
 end
 
+directory "/opt/piwik-#{version}/piwik/tmp/assets" do
+  owner "www-data"
+  group "mysql"
+  mode "0750"
+end
+
 link "/opt/piwik-#{version}/piwik/misc/GeoLite2-ASN.mmdb" do
   to "/usr/share/GeoIP/GeoLite2-ASN.mmdb"
 end