Improve filesystem sandboxing for some services

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 35e9ba62d0760869350ac7ec9a4a5e648f41e575..a86bd7f543f8df057034b607fe5a34567af98dc4 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
 


@@ -25,6 +27,13 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
       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:
+        - RUN /usr/bin/apt-get update -y

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


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


@@ -159,10 +171,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]


@@ -172,17 +180,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]


@@ -225,6 +239,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]


@@ -237,9 +254,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]


@@ -283,6 +297,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]


@@ -298,15 +315,21 @@ 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: stateofthemap
     run_list:
       - recipe[stateofthemap::default]
   - name: ssl
     run_list:
       - recipe[ssl::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]


@@ -332,9 +355,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]


@@ -347,9 +367,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]