Fix duplicate resource warning

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index c0f9c33e7a52af75bc098e659fb2c7d3d9b13130..fa9644287da79f3dc55b5b73780bfd8fbf06b8e4 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -18,6 +18,7 @@
 #
 
 include_recipe "tools"
 #
 
 include_recipe "tools"

+include_recipe "postgresql"

 include_recipe "apache::ssl"
 
 passwords = data_bag_item("otrs", "passwords")
 include_recipe "apache::ssl"
 
 passwords = data_bag_item("otrs", "passwords")


@@ -58,29 +59,29 @@ execute "untar-otrs-#{version}" do
   not_if { File.exist?("/opt/otrs-#{version}") }
 end
 
   not_if { File.exist?("/opt/otrs-#{version}") }
 end
 

+config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
+  line.gsub!(/^( *)\$Self->{Database} = 'otrs'/, "\\1$Self->{Database} = '#{database_name}'")
+  line.gsub!(/^( *)\$Self->{DatabaseUser} = 'otrs'/, "\\1$Self->{DatabaseUser} = '#{database_user}'")
+  line.gsub!(/^( *)\$Self->{DatabasePw} = 'some-pass'/, "\\1$Self->{DatabasePw} = '#{database_password}'")
+  line.gsub!(/^( *)\$Self->{Database} = 'otrs'/, "\\1$Self->{Database} = '#{database_name}'")
+  line.gsub!(/^( *\$Self->{DatabaseDSN} = "DBI:mysql:)/, "#\\1")
+  line.gsub!(/^#( *\$Self->{DatabaseDSN} = "DBI:Pg:.*;host=)/, "\\1")
+
+  line
+end
+

 file "/opt/otrs-#{version}/Kernel/Config.pm" do
   owner user
   group "www-data"
   mode 0664
 file "/opt/otrs-#{version}/Kernel/Config.pm" do
   owner user
   group "www-data"
   mode 0664

-  content_from_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
-    line.gsub!(/^( *)\$Self->{Database} = 'otrs'/, "\\1$Self->{Database} = '#{database_name}'")
-    line.gsub!(/^( *)\$Self->{DatabaseUser} = 'otrs'/, "\\1$Self->{DatabaseUser} = '#{database_user}'")
-    line.gsub!(/^( *)\$Self->{DatabasePw} = 'some-pass'/, "\\1$Self->{DatabasePw} = '#{database_password}'")
-    line.gsub!(/^( *)\$Self->{Database} = 'otrs'/, "\\1$Self->{Database} = '#{database_name}'")
-    line.gsub!(/^( *\$Self->{DatabaseDSN} = "DBI:mysql:)/, "#\\1")
-    line.gsub!(/^#( *\$Self->{DatabaseDSN} = "DBI:Pg:.*;host=)/, "\\1")
-
-    line
-  end
+  content config

 end
 
 file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm" do
   owner user
   group "www-data"
   mode 0664
 end
 
 file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm" do
   owner user
   group "www-data"
   mode 0664

-  content_from_file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm.dist" do |line|
-    line
-  end
+  content IO.read("/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm.dist")

 end
 
 link "/opt/otrs" do
 end
 
 link "/opt/otrs" do


@@ -130,7 +131,7 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
     group "www-data"
     mode 0664
     content IO.read(distname)
     group "www-data"
     mode 0664
     content IO.read(distname)

-    notifies :run, resources(:execute => "/opt/otrs/bin/Cron.sh")
+    notifies :run, "execute[/opt/otrs/bin/Cron.sh]"

   end
 end
 
   end
 end