Use an equality match for TOTP validation

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

diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb
index c71c920c61274167d4244bc05e5eb1e444a79058..b027a86b67614533e267023dc293ed260ada336f 100644 (file)
--- a/cookbooks/otrs/recipes/default.rb
+++ b/cookbooks/otrs/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: otrs
+# Cookbook:: otrs

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2012, OpenStreetMap Foundation
+# Copyright:: 2012, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,26 +17,30 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "tools"
-include_recipe "postgresql"
+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "apache"

+include_recipe "postgresql"
+include_recipe "tools"

 
 passwords = data_bag_item("otrs", "passwords")
 
 package "libapache2-mod-perl2"
 package "libapache2-reload-perl"
 
 
 passwords = data_bag_item("otrs", "passwords")
 
 package "libapache2-mod-perl2"
 package "libapache2-reload-perl"
 

-package "libgd-gd2-perl"
-package "libgd-graph-perl"
-package "libgd-text-perl"
-package "libjson-xs-perl"
-package "libmail-imapclient-perl"
-package "libnet-ldap-perl"
-package "libpdf-api2-perl"
-package "libsoap-lite-perl"
-package "libyaml-libyaml-perl"
-package "libcrypt-eksblowfish-perl"
-package "libtemplate-perl"
+package %w[
+  libcrypt-eksblowfish-perl
+  libdatetime-perl
+  libgd-gd2-perl
+  libgd-graph-perl
+  libgd-text-perl
+  libjson-xs-perl
+  libmail-imapclient-perl
+  libnet-ldap-perl
+  libpdf-api2-perl
+  libsoap-lite-perl
+  libtemplate-perl
+  libyaml-libyaml-perl
+]

 
 apache_module "headers"
 
 
 apache_module "headers"
 


@@ -47,6 +51,7 @@ database_name = node[:otrs][:database_name]
 database_user = node[:otrs][:database_user]
 database_password = passwords[node[:otrs][:database_password]]
 site = node[:otrs][:site]
 database_user = node[:otrs][:database_user]
 database_password = passwords[node[:otrs][:database_password]]
 site = node[:otrs][:site]

+site_aliases = node[:otrs][:site_aliases] || []

 
 postgresql_user database_user do
   cluster database_cluster
 
 postgresql_user database_user do
   cluster database_cluster


@@ -59,8 +64,8 @@ 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"
-  not_if { File.exist?("/opt/otrs-#{version}") }
+  source "https://download.znuny.org/releases/otrs-#{version}.tar.bz2"
+  not_if { ::File.exist?("/opt/otrs-#{version}") }

 end
 
 execute "untar-otrs-#{version}" do
 end
 
 execute "untar-otrs-#{version}" do


@@ -68,7 +73,7 @@ execute "untar-otrs-#{version}" do
   cwd "/opt"
   user "root"
   group "root"
   cwd "/opt"
   user "root"
   group "root"

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

 end
 
 config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
 end
 
 config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|


@@ -79,6 +84,7 @@ config = edit_file "/opt/otrs-#{version}/Kernel/Config.pm.dist" do |line|
   line.gsub!(/^( *\$Self->{DatabaseDSN} = "DBI:mysql:)/, "#\\1")
   line.gsub!(/^#( *\$Self->{DatabaseDSN} = "DBI:Pg:.*;host=)/, "\\1")
   line.gsub!(/^( *)# (\$Self->{CheckMXRecord} = 0)/, "\\1\\2")
   line.gsub!(/^( *\$Self->{DatabaseDSN} = "DBI:mysql:)/, "#\\1")
   line.gsub!(/^#( *\$Self->{DatabaseDSN} = "DBI:Pg:.*;host=)/, "\\1")
   line.gsub!(/^( *)# (\$Self->{CheckMXRecord} = 0)/, "\\1\\2")

+  line.gsub!(/^( *)# \$Self->{SessionUseCookie} = 0/, "\\1$Self->{SessionCheckRemoteIP} = 0")

 
   line
 end
 
   line
 end


@@ -86,7 +92,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
 


@@ -102,14 +108,6 @@ 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/otrs.RebuildConfig.pl" do
-  action :run
-  command "/opt/otrs/bin/otrs.RebuildConfig.pl"
-  user "root"
-  group "root"
-  not_if { File.exist?("/opt/otrs/Kernel/Config/Files/ZZZAAuto.pm") }
-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"


@@ -123,31 +121,32 @@ 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 0o664
+    mode "664"

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

-  domains site
+  domains [site] + site_aliases

   notifies :reload, "service[apache2]"
 end
 
 apache_site site do
   template "apache.erb"
   notifies :reload, "service[apache2]"
 end
 
 apache_site site do
   template "apache.erb"

+  variables :aliases => site_aliases

 end
 
 template "/etc/sudoers.d/otrs" do
   source "sudoers.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/sudoers.d/otrs" do
   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