Remove traces of errol

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 8414198bb327c14e91e830d4ccc63449eabe8724..5325db561aa88bac96b2a22a0c100a271edaddc6 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,13 +1,18 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 14
+  chef_version: 18
+  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,16 @@ 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:
+        - RUN /usr/bin/apt-get update -y
+  - name: ubuntu-22.04
+    driver:
+      image: dokken/ubuntu-22.04

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


@@ -54,6 +66,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,9 +105,18 @@ 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]

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

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


@@ -132,19 +156,47 @@ suites:
   - name: hardware
     run_list:
       - recipe[hardware::default]
   - name: hardware
     run_list:
       - recipe[hardware::default]

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

   - 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: letsencrypt
     run_list:
       - recipe[letsencrypt::default]
   - name: letsencrypt
     run_list:
       - recipe[letsencrypt::default]

+  - name: logstash
+    run_list:
+      - recipe[logstash::default]
+  - name: logstash-forwarder
+    run_list:
+      - recipe[logstash::forwarder]

     attributes:
     attributes:

-      apt:
-        sources:
-          - openstreetmap
+      logstash:
+        forwarder:
+          filebeat.inputs:
+            - type: filestream
+              id: apache
+              paths:
+                - /var/log/apache2/access.log
+              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]


@@ -169,6 +221,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]


@@ -184,12 +239,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:
+      - recipe[php::apache]
+  - name: php-fpm

     run_list:
     run_list:

-      - recipe[piwik::default]
+      - recipe[php::fpm]

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


@@ -218,6 +282,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]


@@ -227,15 +309,27 @@ suites:
   - name: serverinfo
     run_list:
       - recipe[serverinfo::default]
   - name: serverinfo
     run_list:
       - recipe[serverinfo::default]

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

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

-  - name: squid
+  - name: ssl

     run_list:
     run_list:

-      - recipe[squid::default]
+      - recipe[ssl::default]

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

+  - name: stateofthemap-static
+    run_list:
+      - recipe[stateofthemap::static]
+  - name: stateofthemap-jekyll
+    run_list:
+      - recipe[stateofthemap::jekyll]
+  - name: stateofthemap-wordpress
+    run_list:
+      - recipe[stateofthemap::wordpress]

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


@@ -245,6 +339,12 @@ suites:
   - name: switch2osm
     run_list:
       - recipe[switch2osm::default]
   - name: switch2osm
     run_list:
       - recipe[switch2osm::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]


@@ -255,18 +355,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]


@@ -276,3 +376,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]