imagery: increase nginx keepalive again

[chef.git] / .kitchen.yml

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

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

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

+  ipv6: true
+  ipv6_subnet: "fd95:8552:964c::/64"
+  dns:
+    - 1.1.1.1
+    - 8.8.8.8
+    - 8.8.4.4
+    - 1.0.0.1

 
 transport:
   name: dokken
 
 transport:
   name: dokken


@@ -12,26 +21,42 @@ provisioner:
   name: dokken
   chef_license: accept
   data_bags_path: test/data_bags
   name: dokken
   chef_license: accept
   data_bags_path: test/data_bags

+  slow_resource_report: true
+  clean_dokken_sandbox: true

 
 verifier:
 
 verifier:

+  name: inspec

   root_path: /opt/verifier
   sudo: false
 
 platforms:
   root_path: /opt/verifier
   sudo: false
 
 platforms:

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

     driver:
     driver:

-      image: dokken/ubuntu-18.04
+      image: ghcr.io/test-kitchen/dokken/ubuntu-20.04

       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y

-  - name: ubuntu-20.04
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload
+  - name: ubuntu-22.04
+    driver:
+      image: ghcr.io/test-kitchen/dokken/ubuntu-22.04
+      privileged: true
+      pid_one_command: /bin/systemd
+      intermediate_instructions:
+        - RUN /usr/bin/apt-get update -y
+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload
+  - name: debian-12

     driver:
     driver:

-      image: dokken/ubuntu-20.04
+      image: ghcr.io/test-kitchen/dokken/debian-12

       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y

+        - RUN /usr/bin/apt-get install -y eatmydata
+        - RUN echo libeatmydata.so >>/etc/ld.so.preload

 
 suites:
   - name: accounts
 
 suites:
   - name: accounts


@@ -43,6 +68,9 @@ suites:
   - name: apt
     run_list:
       - recipe[apt::default]
   - name: apt
     run_list:
       - recipe[apt::default]

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

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


@@ -58,12 +86,18 @@ suites:
   - name: blogs
     run_list:
       - recipe[blogs::default]
   - name: blogs
     run_list:
       - recipe[blogs::default]

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

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


@@ -91,9 +125,10 @@ suites:
           test:
             interface: eth0
             role: internal
           test:
             interface: eth0
             role: internal

-            address: 172.18.0.2
-            prefix: 16
-            gateway: 172.18.0.1
+            inet:
+              address: 172.18.0.2
+              prefix: 16
+              gateway: 172.18.0.1

         roles:
           external:
             zone: test
         roles:
           external:
             zone: test


@@ -106,9 +141,6 @@ suites:
   - name: docker
     run_list:
       - recipe[docker::default]
   - name: docker
     run_list:
       - recipe[docker::default]

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

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


@@ -118,9 +150,27 @@ suites:
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]

-  - name: forum
+  - name: foundation-board
+    run_list:
+      - recipe[foundation::board]
+  - name: foundation-dwg
+    run_list:
+      - recipe[foundation::dwg]
+  - name: foundation-mastodon
+    run_list:
+      - recipe[foundation::mastodon]
+  - name: foundation-mwg
+    run_list:
+      - recipe[foundation::mwg]
+  - name: foundation-owg

     run_list:
     run_list:

-      - recipe[forum::default]
+      - recipe[foundation::owg]
+  - name: foundation-welcome
+    run_list:
+      - recipe[foundation::welcome]
+  - name: foundation-wiki
+    run_list:
+      - recipe[foundation::wiki]

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


@@ -132,7 +182,9 @@ suites:
         interfaces:
           test:
             role: external
         interfaces:
           test:
             role: external

-            address: 172.18.0.2
+            inet:
+              address: 172.18.0.2
+              prefix: 16

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


@@ -154,9 +206,12 @@ suites:
   - name: hot
     run_list:
       - recipe[hot::default]
   - name: hot
     run_list:
       - recipe[hot::default]

-  - name: incron
+  - name: ideditor

     run_list:
     run_list:

-      - recipe[incron::default]
+      - recipe[ideditor::default]
+  - name: imagery-tiler
+    run_list:
+      - recipe[imagery::tiler]

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


@@ -166,10 +221,6 @@ suites:
   - name: letsencrypt
     run_list:
       - recipe[letsencrypt::default]
   - name: letsencrypt
     run_list:
       - recipe[letsencrypt::default]

-    attributes:
-      apt:
-        sources:
-          - openstreetmap

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


@@ -179,29 +230,26 @@ 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]

-  - name: munin
-    run_list:
-      - recipe[munin::default]
-  - name: munin-plugins
-    run_list:
-      - recipe[munin::plugins]
-  - name: munin-server
-    run_list:
-      - recipe[munin::server]

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


@@ -232,6 +280,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,12 +295,12 @@ 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]

+  - name: planet-aws
+    run_list:
+      - recipe[planet::aws]

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


@@ -274,7 +325,7 @@ suites:
     attributes:
       postgresql:
         versions:
     attributes:
       postgresql:
         versions:

-          - 10
+          - 15

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


@@ -284,9 +335,10 @@ suites:
           test:
             interface: eth0
             role: internal
           test:
             interface: eth0
             role: internal

-            address: 172.18.0.2
-            prefix: 16
-            gateway: 172.18.0.1
+            inet:
+              address: 172.18.0.2
+              prefix: 16
+              gateway: 172.18.0.1

   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]


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

-  - name: stateofthemap
+  - name: stateofthemap-container

     run_list:
     run_list:

-      - recipe[stateofthemap::default]
+      - recipe[stateofthemap::container]
+  - name: stateofthemap-wordpress
+    run_list:
+      - recipe[stateofthemap::wordpress]

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


@@ -339,9 +391,6 @@ 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]


@@ -351,9 +400,6 @@ suites:
   - name: trac
     run_list:
       - recipe[trac::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]