Improve handling of apache mpm selection

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index d5132931b74e3de8525c76b583fa172768f002ba..37f670c794b85ea1851beba10db34421b24640f4 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -12,6 +12,7 @@ provisioner:
 
 verifier:
   root_path: /opt/verifier
+  sudo: false
 
 platforms:
   - name: ubuntu-18.04
@@ -38,26 +39,76 @@ suites:
     attributes:
       bind:
         clients: none
+  - name: blog
+    run_list:
+      - recipe[blog::default]
   - name: blogs
     run_list:
-      - recipe[accounts::default]
       - recipe[blogs::default]
+  - name: clamav
+    run_list:
+      - recipe[clamav::default]
+  - name: devices
+    run_list:
+      - recipe[devices::default]
+  - name: dhcpd
+    run_list:
+      - recipe[dhcpd::default]
+    attributes:
+      dhcpd:
+        first_address: 172.18.100.1
+        last_address: 172.18.100.254
+      networking:
+        interfaces:
+          test:
+            interface: eth0
+            role: internal
+            address: 172.18.0.2
+            prefix: 16
+            gateway: 172.18.0.1
+        roles:
+          external:
+            zone: test
+  - name: dmca
+    run_list:
+      - recipe[dmca::default]
+  - name: donate
+    run_list:
+      - recipe[donate::default]
+  - name: exim
+    run_list:
+      - recipe[exim::default]
+  - name: fail2ban
+    run_list:
+      - recipe[fail2ban::default]
   - name: forum
     run_list:
-      - recipe[accounts::default]
-      - role[forum]
+      - recipe[forum::default]
+  - name: geoipupdate
+    run_list:
+      - recipe[geoipupdate::default]
+  - name: incron
+    run_list:
+      - recipe[incron::default]
   - name: letsencrypt
     run_list:
-      - recipe[accounts::default]
-      - recipe[apt::default]
-      - role[letsencrypt]
+      - recipe[letsencrypt::default]
     attributes:
       apt:
         sources:
           - openstreetmap
+  - name: mailman
+    run_list:
+      - recipe[mailman::default]
+  - name: memcached
+    run_list:
+      - recipe[memcached::default]
   - name: munin
     run_list:
       - recipe[munin::default]
+  - name: munin-plugins
+    run_list:
+      - recipe[munin::plugins]
   - name: munin-server
     run_list:
       - recipe[munin::server]
@@ -67,17 +118,88 @@ suites:
   - name: networking
     run_list:
       - recipe[networking::default]
+  - name: nginx
+    run_list:
+      - recipe[nginx::default]
+  - name: nodejs
+    run_list:
+      - recipe[nodejs::default]
   - name: ntp
     run_list:
       - recipe[ntp::default]
+  - name: openssh
+    run_list:
+      - recipe[openssh::default]
+  - name: osmosis
+    run_list:
+      - recipe[osmosis::default]
   - name: otrs
     run_list:
-      - recipe[accounts::default]
-      - recipe[chef::default]
-      - role[otrs]
+      - recipe[otrs::default]
+  - name: passenger
+    run_list:
+      - recipe[passenger::default]
+  - name: piwik
+    run_list:
+      - recipe[piwik::default]
+  - name: planet
+    run_list:
+      - recipe[planet::default]
+  - name: planet-dump
+    run_list:
+      - recipe[planet::dump]
+  - name: planet-notes
+    run_list:
+      - recipe[planet::notes]
+    attributes:
+      web:
+        readonly_database_host: readonly
+  - name: planet-replication
+    run_list:
+      - recipe[planet::replication]
+    attributes:
+      web:
+        readonly_database_host: readonly
+  - name: postgresql
+    run_list:
+      - recipe[postgresql::default]
+    attributes:
+      postgresql:
+        versions:
+          - 10
   - name: python
     run_list:
       - recipe[python::default]
+  - name: serverinfo
+    run_list:
+      - recipe[serverinfo::default]
+  - name: spamassassin
+    run_list:
+      - recipe[spamassassin::default]
+  - name: squid
+    run_list:
+      - recipe[squid::default]
+  - name: stateofthemap
+    run_list:
+      - recipe[stateofthemap::default]
+  - name: switch2osm
+    run_list:
+      - recipe[switch2osm::default]
+  - name: tilecache
+    run_list:
+      - recipe[tilecache::default]
   - name: tools
     run_list:
       - recipe[tools::default]
+  - name: web-backend
+    run_list:
+      - recipe[web::backend]
+  - name: web-cgimap
+    run_list:
+      - recipe[web::cgimap]
+  - name: web-frontend
+    run_list:
+      - recipe[web::frontend]
+  - name: web-rails
+    run_list:
+      - recipe[web::rails]