Configure database for OTRS before trying to use it

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index c90b28940b3030bbba0615cac7f28029cef1dc00..c1a027e5656b8eb9d5670e4e776dc327bd1b4289 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -47,6 +47,16 @@ database_user = node[:otrs][:database_user]
 database_password = passwords[node[:otrs][:database_password]]
 site = node[:otrs][:site]
 
 database_password = passwords[node[:otrs][:database_password]]
 site = node[:otrs][:site]
 

+postgresql_user database_user do
+  cluster database_cluster
+  password database_password
+end
+
+postgresql_database database_name do
+  cluster database_cluster
+  owner database_user
+end
+

 remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do
   source "http://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
   not_if { File.exist?("/opt/otrs-#{version}") }
 remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do
   source "http://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
   not_if { File.exist?("/opt/otrs-#{version}") }


@@ -75,15 +85,19 @@ end
 file "/opt/otrs-#{version}/Kernel/Config.pm" do
   owner user
   group "www-data"
 file "/opt/otrs-#{version}/Kernel/Config.pm" do
   owner user
   group "www-data"

-  mode 0664
+  mode 0o664

   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"
 file "/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm" do
   owner user
   group "www-data"

-  mode 0664
-  content IO.read("/opt/otrs-#{version}/Kernel/Config/GenericAgent.pm.dist")
+  mode 0o664
+  content generic_agent

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


@@ -95,7 +109,7 @@ execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
   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}"
   user "root"
   group "root"
   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}"
   user "root"
   group "root"

-  not_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }
+  only_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }

 end
 
 execute "/opt/otrs/bin/otrs.RebuildConfig.pl" do
 end
 
 execute "/opt/otrs/bin/otrs.RebuildConfig.pl" do


@@ -106,18 +120,6 @@ execute "/opt/otrs/bin/otrs.RebuildConfig.pl" do
   not_if { File.exist?("/opt/otrs/Kernel/Config/Files/ZZZAAuto.pm") }
 end
 
   not_if { File.exist?("/opt/otrs/Kernel/Config/Files/ZZZAAuto.pm") }
 end
 

-if node[:postgresql][:clusters][database_cluster]
-  postgresql_user database_user do
-    cluster database_cluster
-    password database_password
-  end
-
-  postgresql_database database_name do
-    cluster database_cluster
-    owner database_user
-  end
-end
-

 execute "/opt/otrs/bin/Cron.sh" do
   action :nothing
   command "/opt/otrs/bin/Cron.sh restart"
 execute "/opt/otrs/bin/Cron.sh" do
   action :nothing
   command "/opt/otrs/bin/Cron.sh restart"


@@ -131,7 +133,7 @@ Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
   file name do
     owner "otrs"
     group "www-data"
   file name do
     owner "otrs"
     group "www-data"

-    mode 0664
+    mode 0o664

     content IO.read(distname)
     notifies :run, "execute[/opt/otrs/bin/Cron.sh]"
   end
     content IO.read(distname)
     notifies :run, "execute[/opt/otrs/bin/Cron.sh]"
   end


@@ -145,12 +147,12 @@ template "/etc/sudoers.d/otrs" do
   source "sudoers.erb"
   owner "root"
   group "root"
   source "sudoers.erb"
   owner "root"
   group "root"

-  mode 0440
+  mode 0o440

 end
 
 template "/etc/cron.daily/otrs-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.daily/otrs-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 end