Switch culebre, fafnir, ladon and trogdor to squid 4

[chef.git] / cookbooks / piwik / recipes / default.rb

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 9064522bffaafb86b9ac779b344f31b9f4a4e472..2bd0b97a55ceaad9e9956642a5ddc0d0c17a753f 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: piwik
+# Cookbook:: piwik

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -33,7 +33,9 @@ package "php-apcu"
 
 package "geoipupdate"
 
 
 package "geoipupdate"
 

+apache_module "expires"

 apache_module "php7.2"
 apache_module "php7.2"

+apache_module "rewrite"

 
 version = node[:piwik][:version]
 
 
 version = node[:piwik][:version]
 


@@ -56,6 +58,14 @@ execute "unzip-piwik-#{version}" do
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 

+execute "/opt/piwik-#{version}/piwik/piwik.js" do
+  command "gzip -k -9 /opt/piwik-#{version}/piwik/piwik.js"
+  cwd "/opt/piwik-#{version}"
+  user "root"
+  group "root"
+  not_if { File.exist?("/opt/piwik-#{version}/piwik/piwik.js.gz") }
+end
+

 directory "/opt/piwik-#{version}/piwik/config" do
   owner "www-data"
   group "www-data"
 directory "/opt/piwik-#{version}/piwik/config" do
   owner "www-data"
   group "www-data"