nominiatim: reinclude commented out code

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 1f71e92cd36109cc78ea7783062518d3281920b3..b652e12eae8638fd70ef90ddb714b4ace3da0274 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,13 +1,16 @@
 ---
 driver:
   name: dokken
-  chef_version: 14
+  chef_version: 17
+  env:
+    - container=dokken
 
 transport:
   name: dokken
 
 provisioner:
   name: dokken
+  chef_license: accept
   data_bags_path: test/data_bags
 
 verifier:
@@ -15,9 +18,9 @@ verifier:
   sudo: false
 
 platforms:
-  - name: ubuntu-18.04
+  - name: ubuntu-20.04
     driver:
-      image: dokken/ubuntu-18.04
+      image: dokken/ubuntu-20.04
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
@@ -90,6 +93,12 @@ suites:
   - 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]
@@ -198,6 +207,9 @@ suites:
   - name: nodejs
     run_list:
       - recipe[nodejs::default]
+  - name: nominatim
+    run_list:
+      - recipe[nominatim::default]
   - name: ntp
     run_list:
       - recipe[ntp::default]
@@ -216,6 +228,15 @@ suites:
   - name: passenger
     run_list:
       - recipe[passenger::default]
+  - name: php
+    run_list:
+      - recipe[php::default]
+  - name: php-apache
+    run_list:
+      - recipe[php::apache]
+  - name: php-fpm
+    run_list:
+      - recipe[php::fpm]
   - name: piwik
     run_list:
       - recipe[piwik::default]
@@ -247,6 +268,24 @@ suites:
       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]
@@ -262,9 +301,6 @@ suites:
   - name: spamassassin
     run_list:
       - recipe[spamassassin::default]
-  - name: squid
-    run_list:
-      - recipe[squid::default]
   - name: ssl
     run_list:
       - recipe[ssl::default]
@@ -296,21 +332,18 @@ suites:
   - name: tile
     run_list:
       - recipe[tile::default]
-  - name: tilecache
-    run_list:
-      - recipe[tilecache::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: web-backend
-    run_list:
-      - recipe[web::backend]
   - name: web-cgimap
     run_list:
       - recipe[web::cgimap]
@@ -320,13 +353,9 @@ suites:
   - name: web-rails
     run_list:
       - recipe[web::rails]
+  - name: wiki
+    run_list:
+      - recipe[wiki::default]
   - name: wordpress
     run_list:
       - recipe[wordpress::default]
-  - name: wiki
-    run_list:
-      - recipe[apt::default]
-      - recipe[accounts::default]
-      - recipe[munin::default]
-      - recipe[wiki]
-      - role[wiki]