Add test for mail role

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index e15ed4eac7e511870c44d2cab167e336cf2849ee..613addabd8e243c9f0a693e43f7010a8a3899edd 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -44,6 +44,7 @@ jobs:
           - letsencrypt
           - logstash
           - logstash-forwarder
           - letsencrypt
           - logstash
           - logstash-forwarder

+          - mail

           - mailman
           - memcached
           - munin
           - mailman
           - memcached
           - munin

diff --git a/.kitchen.yml b/.kitchen.yml
index e63b8b85518685c6f79f9c1f1e1b9745ea55f23c..c116e2411ab8597fe899871e1d1e14372ed7cef2 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -165,6 +165,9 @@ suites:
               paths:
                 - /var/log/apache2/access.log
               type: apache
               paths:
                 - /var/log/apache2/access.log
               type: apache

+  - name: mail
+    run_list:
+      - role[mail]

   - name: mailman
     run_list:
       - recipe[mailman::default]
   - name: mailman
     run_list:
       - recipe[mailman::default]

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 6af07c8e1114de61398c7ad5b56bf014d0495f08..9266425e3a64c319948fb9a4d0337fa4db345239 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -26,7 +26,9 @@ package %w[
   ssl-cert
 ]
 
   ssl-cert
 ]
 

-package "exim4-daemon-heavy" if File.exist?("/var/run/clamav/clamd.ctl")
+package "exim4-daemon-heavy" do
+  only_if { ::File.exist?("/var/run/clamav/clamd.ctl") }
+end

 
 group "ssl-cert" do
   action :modify
 
 group "ssl-cert" do
   action :modify

diff --git a/roles/mail.rb b/roles/mail.rb
index 99fcf1a08fbc90d224f125c05a5e531eee90c529..c1c7d307cea2b959d99f05434efba5984859ba88 100644 (file)
--- a/roles/mail.rb
+++ b/roles/mail.rb
@@ -91,5 +91,6 @@ default_attributes(
 
 run_list(
   "recipe[clamav]",
 
 run_list(
   "recipe[clamav]",

+  "recipe[exim]",

   "recipe[spamassassin]"
 )
   "recipe[spamassassin]"
 )

diff --git a/test/data_bags/exim/aliases.json b/test/data_bags/exim/aliases.json
new file mode 100644 (file)
index 0000000..7003ab2
--- /dev/null
+++ b/test/data_bags/exim/aliases.json
@@ -0,0 +1,6 @@
+{
+  "id": "aliases",
+  "mail": {
+    "test": "test@example.com"
+  }
+}

diff --git a/test/data_bags/exim/dkim.json b/test/data_bags/exim/dkim.json
new file mode 100644 (file)
index 0000000..0a20d50
--- /dev/null
+++ b/test/data_bags/exim/dkim.json
@@ -0,0 +1,7 @@
+{
+  "id": "dkim",
+  "openstreetmap.org": [
+    "-----BEGIN RSA PRIVATE KEY-----",
+    "-----END RSA PRIVATE KEY-----"
+  ]
+}

diff --git a/test/integration/mail/serverspec/clamav_spec.rb b/test/integration/mail/serverspec/clamav_spec.rb
new file mode 100644 (file)
index 0000000..ce8687e
--- /dev/null
+++ b/test/integration/mail/serverspec/clamav_spec.rb
@@ -0,0 +1,22 @@
+require "serverspec"
+
+# Required by serverspec
+set :backend, :exec
+
+describe package("clamav-daemon") do
+  it { should be_installed }
+end
+
+describe service("clamav-daemon") do
+  it { should be_enabled }
+  it { should be_running }
+end
+
+describe package("clamav-freshclam") do
+  it { should be_installed }
+end
+
+describe service("clamav-freshclam") do
+  it { should be_enabled }
+  it { should be_running }
+end

diff --git a/test/integration/mail/serverspec/exim_spec.rb b/test/integration/mail/serverspec/exim_spec.rb
new file mode 100644 (file)
index 0000000..2a6f6b2
--- /dev/null
+++ b/test/integration/mail/serverspec/exim_spec.rb
@@ -0,0 +1,17 @@
+require "serverspec"
+
+# Required by serverspec
+set :backend, :exec
+
+describe package("exim4") do
+  it { should be_installed }
+end
+
+describe service("exim4") do
+  it { should be_enabled }
+  it { should be_running }
+end
+
+describe port(25) do
+  it { should be_listening.with("tcp") }
+end

diff --git a/test/integration/mail/serverspec/spamassassin_spec.rb b/test/integration/mail/serverspec/spamassassin_spec.rb
new file mode 100644 (file)
index 0000000..1276f14
--- /dev/null
+++ b/test/integration/mail/serverspec/spamassassin_spec.rb
@@ -0,0 +1,17 @@
+require "serverspec"
+
+# Required by serverspec
+set :backend, :exec
+
+describe package("spamassassin") do
+  it { should be_installed }
+end
+
+describe service("spamassassin") do
+  it { should be_enabled }
+  it { should be_running }
+end
+
+describe port(783) do
+  it { should be_listening.with("tcp") }
+end