From a9d45436d97848d3c7724f1759b7d01d48909e7f Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 15 Mar 2024 10:01:26 +0000
Subject: [PATCH] Fix exim daemon options for Ubuntu

---
 Gemfile                                      |  1 +
 Gemfile.lock                                 | 37 ++++++++++++++++++++
 cookbooks/exim/templates/default/default.erb |  7 ++++
 3 files changed, 45 insertions(+)

diff --git a/Gemfile b/Gemfile
index ec9eb03b0..440446a5c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
 gem "cookstyle"
+gem "erb_lint"
 gem "kitchen-dokken"
 gem "kitchen-inspec"
 gem "test-kitchen"
diff --git a/Gemfile.lock b/Gemfile.lock
index 8e7ad2547..f45720215 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    actionview (7.0.7.2)
+      activesupport (= 7.0.7.2)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
     activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -256,6 +262,13 @@ GEM
     azure_mgmt_storage (0.23.0)
       ms_rest_azure (~> 0.12.0)
     bcrypt_pbkdf (1.1.0)
+    better_html (2.1.0)
+      actionview (>= 6.0)
+      activesupport (>= 6.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      parser (>= 2.4)
+      smart_properties
     bson (4.15.0)
     builder (3.2.4)
     chef-config (18.2.7)
@@ -274,6 +287,7 @@ GEM
     concurrent-ruby (1.2.2)
     cookstyle (7.32.8)
       rubocop (= 1.25.1)
+    crass (1.0.6)
     declarative (0.0.20)
     diff-lcs (1.5.0)
     docker-api (2.2.0)
@@ -282,6 +296,13 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.3.0)
+    erb_lint (0.5.0)
+      activesupport
+      better_html (>= 2.0.1)
+      parser (>= 2.7.1.4)
+      rainbow
+      rubocop
+      smart_properties
     erubi (1.12.0)
     excon (0.105.0)
     faraday (1.10.3)
@@ -400,9 +421,13 @@ GEM
     logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
     memoist (0.16.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
     minitest (5.19.0)
     mixlib-config (3.0.27)
       tomlrb
@@ -432,6 +457,9 @@ GEM
     net-ssh (7.2.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
+    nokogiri (1.16.2)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nori (2.6.0)
     options (2.3.2)
     os (1.1.4)
@@ -450,6 +478,13 @@ GEM
       method_source (~> 1.0)
     public_suffix (5.0.3)
     racc (1.7.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.9.0)
@@ -496,6 +531,7 @@ GEM
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
+    smart_properties (1.17.0)
     sslshake (1.3.1)
     strings (0.2.1)
       strings-ansi (~> 0.2)
@@ -673,6 +709,7 @@ PLATFORMS
 
 DEPENDENCIES
   cookstyle
+  erb_lint
   kitchen-dokken
   kitchen-inspec
   test-kitchen
diff --git a/cookbooks/exim/templates/default/default.erb b/cookbooks/exim/templates/default/default.erb
index 2fb3dcc17..8b34fcde2 100644
--- a/cookbooks/exim/templates/default/default.erb
+++ b/cookbooks/exim/templates/default/default.erb
@@ -1,5 +1,11 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
+<% if node.platform?("ubuntu") && node[:lsb][:release].to_f >= 22.04 -%>
+# options for update-exim4.conf
+UPEX4OPTS=''
+# options for exim4
+EXIMSERVICE='-bdf -q30s'
+<% else -%>
 # 'combined' -   one daemon running queue and listening on SMTP port
 # 'no'       -   no daemon running the queue
 # 'separate' -   two separate daemons
@@ -19,5 +25,6 @@ QUEUERUNNEROPTIONS=''
 QFLAGS=''
 # options for daemon listening on port 25
 SMTPLISTENEROPTIONS=''
+<% end -%>
 # only warn once about each error
 E4BCD_WATCH_PANICLOG='once'
-- 
2.45.1