X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/bf4c91815e210ba175f610713fa43cba3aa7d347..aa1f2db64d874f4dd47ebeed427ca44c87947a5b:/.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 792b4198b..db9eb9680 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -40,7 +40,6 @@ suites:
         clients: none
   - name: blogs
     run_list:
-      - recipe[accounts::default]
       - recipe[blogs::default]
   - name: clamav
     run_list:
@@ -74,8 +73,7 @@ suites:
         mpm: prefork
   - name: donate
     run_list:
-      - recipe[accounts::default]
-      - role[donate]
+      - recipe[donate::default]
     attributes:
       apache:
         mpm: prefork
@@ -87,27 +85,29 @@ suites:
       - recipe[fail2ban::default]
   - name: forum
     run_list:
-      - recipe[accounts::default]
-      - role[forum]
+      - recipe[forum::default]
+    attributes:
+      apache:
+        mpm: prefork
   - 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: 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]
@@ -119,7 +119,6 @@ suites:
       - recipe[networking::default]
   - name: nginx
     run_list:
-      - recipe[munin::default]
       - recipe[nginx::default]
     attributes:
       networking:
@@ -139,9 +138,25 @@ suites:
       - recipe[osmosis::default]
   - name: otrs
     run_list:
-      - recipe[accounts::default]
-      - recipe[chef::default]
-      - role[otrs]
+      - recipe[otrs::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: python
     run_list:
       - recipe[python::default]
@@ -150,7 +165,6 @@ suites:
       - recipe[spamassassin::default]
   - name: squid
     run_list:
-      - recipe[apt::default]
       - recipe[squid::default]
   - name: tools
     run_list: