Only force the prefork mpm when mod_php is used

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 532299aa16ec1d4e69380a49f0fa1940b8dc8cac..17d9839f6080f4b134af0ca6785d1d5205c2c6be 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,13 +1,16 @@
 ---
 driver:
   name: dokken
-  chef_version: 14
+  chef_version: 15
+  env:
+    - container=dokken
 
 transport:
   name: dokken
 
 provisioner:
   name: dokken
+  chef_license: accept
   data_bags_path: test/data_bags
 
 verifier:
@@ -90,6 +93,12 @@ suites:
   - name: dmca
     run_list:
       - recipe[dmca::default]
+  - name: dns
+    run_list:
+      - recipe[dns::default]
+  - name: docker
+    run_list:
+      - recipe[docker::default]
   - name: donate
     run_list:
       - recipe[donate::default]
@@ -141,6 +150,9 @@ suites:
   - name: incron
     run_list:
       - recipe[incron::default]
+  - name: irc
+    run_list:
+      - recipe[irc::default]
   - name: kibana
     run_list:
       - recipe[kibana::default]
@@ -165,6 +177,9 @@ suites:
               paths:
                 - /var/log/apache2/access.log
               type: apache
+  - name: mail
+    run_list:
+      - role[mail]
   - name: mailman
     run_list:
       - recipe[mailman::default]
@@ -192,6 +207,9 @@ suites:
   - name: nodejs
     run_list:
       - recipe[nodejs::default]
+  - name: nominatim
+    run_list:
+      - recipe[nominatim::default]
   - name: ntp
     run_list:
       - recipe[ntp::default]
@@ -210,6 +228,15 @@ suites:
   - name: passenger
     run_list:
       - recipe[passenger::default]
+  - name: php
+    run_list:
+      - recipe[php::default]
+  - name: php-apache
+    run_list:
+      - recipe[php::apache]
+  - name: php-fpm
+    run_list:
+      - recipe[php::fpm]
   - name: piwik
     run_list:
       - recipe[piwik::default]
@@ -293,6 +320,9 @@ suites:
   - name: tilecache
     run_list:
       - recipe[tilecache::default]
+  - name: tilelog
+    run_list:
+      - recipe[tilelog::default]
   - name: tools
     run_list:
       - recipe[tools::default]
@@ -311,3 +341,9 @@ suites:
   - name: web-rails
     run_list:
       - recipe[web::rails]
+  - name: wiki
+    run_list:
+      - recipe[wiki::default]
+  - name: wordpress
+    run_list:
+      - recipe[wordpress::default]