Document IP ranges with comment

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 854666cc6f144da828f0d82d36baea55a82d5ead..84a501546457fc32f8534d7e2d63a82c28823be4 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,7 +1,9 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 16
+  chef_version: 17
+  volumes:
+    - /var/lib/docker

   env:
     - container=dokken
 
   env:
     - container=dokken
 


@@ -18,13 +20,6 @@ verifier:
   sudo: false
 
 platforms:
   sudo: false
 
 platforms:

-  - name: ubuntu-18.04
-    driver:
-      image: dokken/ubuntu-18.04
-      privileged: true
-      pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update -y

   - name: ubuntu-20.04
     driver:
       image: dokken/ubuntu-20.04
   - name: ubuntu-20.04
     driver:
       image: dokken/ubuntu-20.04


@@ -64,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]


@@ -179,17 +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: mail
     run_list:
       - role[mail]
   - 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]


@@ -232,6 +236,9 @@ 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]


@@ -244,9 +251,6 @@ suites:
   - name: php-fpm
     run_list:
       - recipe[php::fpm]
   - name: php-fpm
     run_list:
       - recipe[php::fpm]

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

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


@@ -290,6 +294,9 @@ suites:
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]
   - 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]


@@ -305,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]


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

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

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

+  - name: timescaledb
+    run_list:
+      - 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]