Update postgresql exporter configuration

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index e43a89244398a6bf51bbc5a2960574005e93b62e..0b391a62cc3479cede8e5b1bfcfe32d962e296eb 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -19,6 +19,7 @@
 
 include_recipe "accounts"
 include_recipe "apache"
 
 include_recipe "accounts"
 include_recipe "apache"

+include_recipe "exim"

 include_recipe "postgresql"
 include_recipe "tools"
 
 include_recipe "postgresql"
 include_recipe "tools"
 


@@ -28,6 +29,8 @@ package "libapache2-mod-perl2"
 package "libapache2-reload-perl"
 
 package %w[
 package "libapache2-reload-perl"
 
 package %w[

+  tar
+  bzip2

   libcrypt-eksblowfish-perl
   libdatetime-perl
   libgd-gd2-perl
   libcrypt-eksblowfish-perl
   libdatetime-perl
   libgd-gd2-perl


@@ -35,6 +38,7 @@ package %w[
   libgd-text-perl
   libjson-xs-perl
   libmail-imapclient-perl
   libgd-text-perl
   libjson-xs-perl
   libmail-imapclient-perl

+  libmoo-perl

   libnet-ldap-perl
   libpdf-api2-perl
   libsoap-lite-perl
   libnet-ldap-perl
   libpdf-api2-perl
   libsoap-lite-perl


@@ -64,7 +68,7 @@ postgresql_database database_name do
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/otrs-#{version}.tar.bz2" do

-  source "https://ftp.otrs.org/pub/otrs/otrs-#{version}.tar.bz2"
+  source "https://download.znuny.org/releases/otrs-#{version}.tar.bz2"

   not_if { ::File.exist?("/opt/otrs-#{version}") }
 end
 
   not_if { ::File.exist?("/opt/otrs-#{version}") }
 end
 


@@ -92,7 +96,7 @@ 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 0o664
+  mode "664"

   content config
 end
 
   content config
 end
 


@@ -108,23 +112,21 @@ execute "/opt/otrs/bin/otrs.SetPermissions.pl" do
   only_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }
 end
 
   only_if { File.stat("/opt/otrs/README.md").uid != Etc.getpwnam("otrs").uid }
 end
 

-execute "/opt/otrs/bin/Cron.sh" do
-  action :nothing
-  command "/opt/otrs/bin/Cron.sh restart"
+systemd_service "otrs" do
+  description "OTRS Daemon"
+  type "forking"

   user "otrs"
   group "otrs"
   user "otrs"
   group "otrs"

+  exec_start "/opt/otrs/bin/otrs.Daemon.pl start"
+  private_tmp true
+  protect_system "strict"
+  protect_home true
+  read_write_paths ["/opt/otrs-#{version}/var", "/var/log/exim4", "/var/spool/exim4"]

 end
 
 end
 

-Dir.glob("/opt/otrs/var/cron/*.dist") do |distname|
-  name = distname.sub(".dist", "")
-
-  file name do
-    owner "otrs"
-    group "www-data"
-    mode 0o664
-    content IO.read(distname)
-    notifies :run, "execute[/opt/otrs/bin/Cron.sh]"
-  end
+service "otrs" do
+  action [:enable, :start]
+  subscribes :restart, "systemd_service[otrs]"

 end
 
 ssl_certificate site do
 end
 
 ssl_certificate site do


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

-  mode 0o440
+  mode "440"

 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 0o755
+  mode "755"

 end
 end