Improve handling of apache mpm selection

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index e9350cc01b0f22c686a0abcbf2947a663af8b7b2..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,6 +39,9 @@ suites:
     attributes:
       bind:
         clients: none
+  - name: blog
+    run_list:
+      - recipe[blog::default]
   - name: blogs
     run_list:
       - recipe[blogs::default]
@@ -68,15 +72,9 @@ suites:
   - name: dmca
     run_list:
       - recipe[dmca::default]
-    attributes:
-      apache:
-        mpm: prefork
   - name: donate
     run_list:
       - recipe[donate::default]
-    attributes:
-      apache:
-        mpm: prefork
   - name: exim
     run_list:
       - recipe[exim::default]
@@ -86,9 +84,6 @@ suites:
   - name: forum
     run_list:
       - recipe[forum::default]
-    attributes:
-      apache:
-        mpm: prefork
   - name: geoipupdate
     run_list:
       - recipe[geoipupdate::default]
@@ -102,6 +97,9 @@ suites:
       apt:
         sources:
           - openstreetmap
+  - name: mailman
+    run_list:
+      - recipe[mailman::default]
   - name: memcached
     run_list:
       - recipe[memcached::default]
@@ -123,10 +121,6 @@ suites:
   - name: nginx
     run_list:
       - recipe[nginx::default]
-    attributes:
-      networking:
-        nameservers:
-          - 127.0.0.1
   - name: nodejs
     run_list:
       - recipe[nodejs::default]
@@ -145,6 +139,9 @@ suites:
   - name: passenger
     run_list:
       - recipe[passenger::default]
+  - name: piwik
+    run_list:
+      - recipe[piwik::default]
   - name: planet
     run_list:
       - recipe[planet::default]
@@ -163,22 +160,34 @@ suites:
     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]
-    attributes:
-      networking:
-        nameservers:
-          - 127.0.0.1
   - name: tools
     run_list:
       - recipe[tools::default]