Disable virtual host support for squid 3 caches

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index 96258ae4b32ae02311999643db6f814014df3b4c..77ac3912d8fd08e82dadaad59bbe95a3739b1b3b 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -36,6 +36,7 @@ package "libpdf-api2-perl"
 package "libsoap-lite-perl"
 package "libyaml-libyaml-perl"
 package "libcrypt-eksblowfish-perl"
 package "libsoap-lite-perl"
 package "libyaml-libyaml-perl"
 package "libcrypt-eksblowfish-perl"

+package "libtemplate-perl"

 
 apache_module "headers"
 
 
 apache_module "headers"
 


@@ -95,17 +96,6 @@ file "/opt/otrs-#{version}/Kernel/Config.pm" do
   content config
 end
 
   content config
 end
 

-generic_agent = edit_file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm.dist" do |line|
-  line
-end
-
-file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm" do
-  owner user
-  group "www-data"
-  mode 0o664
-  content generic_agent
-end
-

 link "/opt/otrs-#{version}/Kernel/Config/Files/ZZZAuto.pm" do
   to "#{old_installation}/Kernel/Config/Files/ZZZAuto.pm"
   link_type :hard
 link "/opt/otrs-#{version}/Kernel/Config/Files/ZZZAuto.pm" do
   to "#{old_installation}/Kernel/Config/Files/ZZZAuto.pm"
   link_type :hard


@@ -122,7 +112,7 @@ end
 
 execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
   action :run
 
 execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
   action :run

-  command "/opt/otrs/bin/otrs.SetPermissions.pl --otrs-user=#{user} --web-user=www-data --otrs-group=www-data --web-group=www-data /opt/otrs-#{version}"
+  command "/opt/otrs/bin/otrs.SetPermissions.pl --otrs-user=#{user} --web-group=www-data /opt/otrs-#{version}"

   user "root"
   group "root"
   only_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }
   user "root"
   group "root"
   only_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }