Merge remote-tracking branch 'github/pull/525'

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index e5ea0008e757708f2b82fd5da373589dba68fa64..84a501546457fc32f8534d7e2d63a82c28823be4 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,13 +1,18 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 14
+  chef_version: 17
+  volumes:
+    - /var/lib/docker
+  env:
+    - container=dokken

 
 transport:
   name: dokken
 
 provisioner:
   name: dokken
 
 transport:
   name: dokken
 
 provisioner:
   name: dokken

+  chef_license: accept

   data_bags_path: test/data_bags
 
 verifier:
   data_bags_path: test/data_bags
 
 verifier:


@@ -15,9 +20,9 @@ verifier:
   sudo: false
 
 platforms:
   sudo: false
 
 platforms:

-  - name: ubuntu-18.04
+  - name: ubuntu-20.04

     driver:
     driver:

-      image: dokken/ubuntu-18.04
+      image: dokken/ubuntu-20.04

       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:


@@ -54,6 +59,9 @@ suites:
   - name: clamav
     run_list:
       - recipe[clamav::default]
   - name: clamav
     run_list:
       - recipe[clamav::default]

+  - name: community
+    run_list:
+      - recipe[community::default]

   - name: db-backup
     run_list:
       - recipe[db::backup]
   - name: db-backup
     run_list:
       - recipe[db::backup]


@@ -90,6 +98,12 @@ suites:
   - name: dmca
     run_list:
       - recipe[dmca::default]
   - 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]
   - name: donate
     run_list:
       - recipe[donate::default]


@@ -141,6 +155,9 @@ suites:
   - name: incron
     run_list:
       - recipe[incron::default]
   - name: incron
     run_list:
       - recipe[incron::default]

+  - name: irc
+    run_list:
+      - recipe[irc::default]

   - name: kibana
     run_list:
       - recipe[kibana::default]
   - name: kibana
     run_list:
       - recipe[kibana::default]


@@ -160,14 +177,23 @@ suites:
     attributes:
       logstash:
         forwarder:
     attributes:
       logstash:
         forwarder:

-          filebeat.prospectors:
-            - input_type: log
+          filebeat.inputs:
+            - type: filestream
+              id: apache

               paths:
                 - /var/log/apache2/access.log
               paths:
                 - /var/log/apache2/access.log

-              type: apache
+              fields:
+                type: apache
+              fields_under_root: true
+  - name: mail
+    run_list:
+      - role[mail]

   - name: mailman
     run_list:
       - recipe[mailman::default]
   - name: mailman
     run_list:
       - recipe[mailman::default]

+  - name: matomo
+    run_list:
+      - recipe[matomo::default]

   - name: memcached
     run_list:
       - recipe[memcached::default]
   - name: memcached
     run_list:
       - recipe[memcached::default]


@@ -192,6 +218,9 @@ suites:
   - name: nodejs
     run_list:
       - recipe[nodejs::default]
   - name: nodejs
     run_list:
       - recipe[nodejs::default]

+  - name: nominatim
+    run_list:
+      - recipe[nominatim::default]

   - name: ntp
     run_list:
       - recipe[ntp::default]
   - name: ntp
     run_list:
       - recipe[ntp::default]


@@ -207,12 +236,21 @@ suites:
   - name: otrs
     run_list:
       - recipe[otrs::default]
   - name: otrs
     run_list:
       - recipe[otrs::default]

+  - name: overpass
+    run_list:
+      - recipe[overpass::default]

   - name: passenger
     run_list:
       - recipe[passenger::default]
   - name: passenger
     run_list:
       - recipe[passenger::default]

-  - name: piwik
+  - name: php
+    run_list:
+      - recipe[php::default]
+  - name: php-apache

     run_list:
     run_list:

-      - recipe[piwik::default]
+      - recipe[php::apache]
+  - name: php-fpm
+    run_list:
+      - recipe[php::fpm]

   - name: planet
     run_list:
       - recipe[planet::default]
   - name: planet
     run_list:
       - recipe[planet::default]


@@ -241,6 +279,24 @@ suites:
       postgresql:
         versions:
           - 10
       postgresql:
         versions:
           - 10

+  - name: prometheus
+    run_list:
+      - recipe[prometheus::default]
+    attributes:
+      networking:
+        interfaces:
+          test:
+            interface: eth0
+            role: internal
+            address: 172.18.0.2
+            prefix: 16
+            gateway: 172.18.0.1
+  - name: prometheus-server
+    run_list:
+      - recipe[prometheus::server]
+    attributes:
+      prometheus:
+        promscale: true

   - name: python
     run_list:
       - recipe[python::default]
   - name: python
     run_list:
       - recipe[python::default]


@@ -256,9 +312,6 @@ suites:
   - name: spamassassin
     run_list:
       - recipe[spamassassin::default]
   - name: spamassassin
     run_list:
       - recipe[spamassassin::default]

-  - name: squid
-    run_list:
-      - recipe[squid::default]

   - name: ssl
     run_list:
       - recipe[ssl::default]
   - name: ssl
     run_list:
       - recipe[ssl::default]


@@ -277,6 +330,9 @@ suites:
   - name: sysctl
     run_list:
       - recipe[sysctl::default]
   - name: sysctl
     run_list:
       - recipe[sysctl::default]

+  - name: sysfs
+    run_list:
+      - recipe[sysfs::default]

   - name: taginfo
     run_list:
       - recipe[taginfo::default]
   - name: taginfo
     run_list:
       - recipe[taginfo::default]


@@ -287,18 +343,18 @@ suites:
   - name: tile
     run_list:
       - recipe[tile::default]
   - name: tile
     run_list:
       - recipe[tile::default]

-  - name: tilecache
+  - name: tilelog
+    run_list:
+      - recipe[tilelog::default]
+  - name: timescaledb

     run_list:
     run_list:

-      - recipe[tilecache::default]
+      - recipe[timescaledb::default]

   - name: tools
     run_list:
       - recipe[tools::default]
   - name: trac
     run_list:
       - recipe[trac::default]
   - name: tools
     run_list:
       - recipe[tools::default]
   - name: trac
     run_list:
       - recipe[trac::default]

-  - name: web-backend
-    run_list:
-      - recipe[web::backend]

   - name: web-cgimap
     run_list:
       - recipe[web::cgimap]
   - name: web-cgimap
     run_list:
       - recipe[web::cgimap]


@@ -308,3 +364,9 @@ suites:
   - name: web-rails
     run_list:
       - recipe[web::rails]
   - name: web-rails
     run_list:
       - recipe[web::rails]

+  - name: wiki
+    run_list:
+      - recipe[wiki::default]
+  - name: wordpress
+    run_list:
+      - recipe[wordpress::default]