apt: remove unused preferences files

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 6dc0dad227c6a323a2841716223961a127021ea5..47630151624ed9fa3c1c118473741970ccd99c6c 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,7 +1,7 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 17
+  chef_version: 18

   volumes:
     - /var/lib/docker
   env:
   volumes:
     - /var/lib/docker
   env:


@@ -14,6 +14,7 @@ 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

 
 verifier:
   root_path: /opt/verifier
 
 verifier:
   root_path: /opt/verifier


@@ -27,6 +28,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


@@ -119,6 +127,21 @@ suites:
   - name: forum
     run_list:
       - recipe[forum::default]
   - name: forum
     run_list:
       - recipe[forum::default]

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

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


@@ -164,10 +187,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]


@@ -177,17 +196,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]


@@ -245,9 +270,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]


@@ -315,6 +337,15 @@ suites:
   - 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]