Improve handling of apache mpm selection

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 576c3e955e57f26d4aefea34022e92f3d2df1c46..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,9 +39,11 @@ 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:
@@ -69,16 +72,9 @@ suites:
   - name: dmca
     run_list:
       - recipe[dmca::default]
-    attributes:
-      apache:
-        mpm: prefork
   - name: donate
     run_list:
-      - recipe[accounts::default]
-      - role[donate]
-    attributes:
-      apache:
-        mpm: prefork
+      - recipe[donate::default]
   - name: exim
     run_list:
       - recipe[exim::default]
@@ -87,24 +83,32 @@ suites:
       - 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[munin::default]
       - 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]
@@ -116,12 +120,7 @@ suites:
       - recipe[networking::default]
   - name: nginx
     run_list:
-      - recipe[munin::default]
       - recipe[nginx::default]
-    attributes:
-      networking:
-        nameservers:
-          - 127.0.0.1
   - name: nodejs
     run_list:
       - recipe[nodejs::default]
@@ -131,17 +130,76 @@ suites:
   - 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]