Improve check for whether to run freshclam

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index cd6ebeb1a36188eedd749dac02032c9ed0948e28..0f9e0f7a1d348f93de2e834b3a51daa3217960eb 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,16 +1,26 @@
 ---
 driver:
 ---
 driver:

-  name: vagrant
-  provision: true
-  vagrantfiles:
-    - .kitchen.provision.rb
+  name: dokken
+  chef_version: 14
+
+transport:
+  name: dokken

 
 provisioner:
 
 provisioner:

-  name: chef_zero
+  name: dokken

   data_bags_path: test/data_bags
 
   data_bags_path: test/data_bags
 

+verifier:
+  root_path: /opt/verifier
+

 platforms:
 platforms:

-  - name: ubuntu-16.04
+  - name: ubuntu-18.04
+    driver:
+      image: dokken/ubuntu-18.04
+      privileged: true
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y

 
 suites:
   - name: accounts
 
 suites:
   - name: accounts


@@ -19,23 +29,38 @@ suites:
   - name: apache
     run_list:
       - recipe[apache::default]
   - name: apache
     run_list:
       - recipe[apache::default]

-  - name: apache-ssl
-    run_list:
-      - recipe[apache::ssl]

   - name: apt
     run_list:
       - recipe[apt::default]
   - name: bind
     run_list:
       - recipe[bind::default]
   - name: apt
     run_list:
       - recipe[apt::default]
   - name: bind
     run_list:
       - recipe[bind::default]

+    attributes:
+      bind:
+        clients: none

   - name: blogs
     run_list:
       - recipe[accounts::default]
       - recipe[blogs::default]
   - name: blogs
     run_list:
       - recipe[accounts::default]
       - recipe[blogs::default]

+  - name: clamav
+    run_list:
+      - recipe[clamav::default]
+  - name: exim
+    run_list:
+      - recipe[exim::default]

   - name: forum
     run_list:
       - recipe[accounts::default]
       - role[forum]
   - name: forum
     run_list:
       - recipe[accounts::default]
       - role[forum]

+  - name: letsencrypt
+    run_list:
+      - recipe[accounts::default]
+      - recipe[apt::default]
+      - role[letsencrypt]
+    attributes:
+      apt:
+        sources:
+          - openstreetmap

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


@@ -48,6 +73,20 @@ suites:
   - name: networking
     run_list:
       - recipe[networking::default]
   - name: networking
     run_list:
       - recipe[networking::default]

+  - name: ntp
+    run_list:
+      - recipe[ntp::default]
+  - name: otrs
+    run_list:
+      - recipe[accounts::default]
+      - recipe[chef::default]
+      - role[otrs]
+  - name: python
+    run_list:
+      - recipe[python::default]
+  - name: spamassassin
+    run_list:
+      - recipe[spamassassin::default]

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