X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ba52cff4fe200273f351d494fd08338c4e569ad3..d16f3d1a7f01a40ad821948956a21d26fdcab32b:/cookbooks/otrs/recipes/default.rb

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 8f2d8d6db..f16931b32 100644
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -25,13 +25,11 @@ include_recipe "tools"
 
 passwords = data_bag_item("otrs", "passwords")
 
-package "libapache2-mod-perl2"
-package "libapache2-reload-perl"
-
 package %w[
   tar
   bzip2
   libapache-dbi-perl
+  libapache2-reload-perl
   libarchive-zip-perl
   libauthen-ntlm-perl
   libauthen-sasl-perl
@@ -71,7 +69,13 @@ package %w[
   libyaml-perl
 ]
 
+apache_module "perl" do
+  package "libapache2-mod-perl2"
+end
+
+apache_module "deflate"
 apache_module "headers"
+apache_module "rewrite"
 
 version = node[:otrs][:version]
 user = node[:otrs][:user]
@@ -123,18 +127,19 @@ file "/opt/znuny-#{version}/Kernel/Config.pm" do
   group "www-data"
   mode "664"
   content config
+  notifies :restart, "service[otrs]"
 end
 
-link "/opt/otrs" do
-  to "/opt/znuny-#{version}"
-end
-
-execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
-  action :run
-  command "/opt/otrs/bin/otrs.SetPermissions.pl --otrs-user=#{user} --web-group=www-data /opt/otrs-#{version}"
+execute "/opt/znuny-#{version}/bin/otrs.SetPermissions.pl" do
+  action :nothing
+  command "/opt/znuny-#{version}/bin/otrs.SetPermissions.pl --otrs-user=#{user} --web-group=www-data /opt/znuny-#{version}"
   user "root"
   group "root"
-  only_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }
+  subscribes :run, "execute[untar-znuny-#{version}]"
+end
+
+link "/opt/otrs" do
+  to "/opt/znuny-#{version}"
 end
 
 systemd_service "otrs" do
@@ -151,6 +156,7 @@ end
 
 service "otrs" do
   action [:enable, :start]
+  subscribes :restart, "link[/opt/otrs]"
   subscribes :restart, "systemd_service[otrs]"
 end