Switch OSMF default site to bare domain

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 2e48b43d527ed0ac7b1870b3e3823606e5ffb68e..3d96745332732d93d53b5721b5e32115160cb581 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,27 +1,62 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 14
+  chef_version: 18
+  volumes:
+    - /var/lib/docker
+  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
 
 provisioner:
   name: dokken
 
 transport:
   name: dokken
 
 provisioner:
   name: dokken

+  chef_license: accept

   data_bags_path: test/data_bags
   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

+        - 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:
+      image: ghcr.io/test-kitchen/dokken/debian-12
+      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


@@ -33,6 +68,12 @@ 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: bind
     run_list:
       - recipe[bind::default]
   - name: bind
     run_list:
       - recipe[bind::default]


@@ -51,6 +92,21 @@ 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-base
+    run_list:
+      - recipe[db::base]
+  - name: db-master
+    run_list:
+      - recipe[db::master]
+  - name: db-slave
+    run_list:
+      - recipe[db::slave]

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


@@ -66,27 +122,52 @@ 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
   - name: dmca
     run_list:
       - recipe[dmca::default]
         roles:
           external:
             zone: test
   - name: dmca
     run_list:
       - recipe[dmca::default]

-  - name: donate
+  - name: dns
+    run_list:
+      - recipe[dns::default]
+  - name: docker
+    run_list:
+      - recipe[docker::default]
+  - name: elasticsearch

     run_list:
     run_list:

-      - recipe[donate::default]
+      - recipe[elasticsearch::default]

   - name: exim
     run_list:
       - recipe[exim::default]
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]
   - name: exim
     run_list:
       - recipe[exim::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-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: geodns
     run_list:
       - recipe[geodns::default]
   - name: geodns
     run_list:
       - recipe[geodns::default]


@@ -95,26 +176,68 @@ 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]

+  - name: git
+    run_list:
+      - recipe[git::default]
+  - name: git-server
+    run_list:
+      - recipe[git::server]
+  - name: git-web
+    run_list:
+      - recipe[git::web]

   - name: gps-tile
     run_list:
       - recipe[gps-tile::default]
   - name: gps-tile
     run_list:
       - recipe[gps-tile::default]

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

     run_list:
     run_list:

-      - recipe[incron::default]
+      - recipe[hot::default]
+  - name: ideditor
+    run_list:
+      - recipe[ideditor::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]


@@ -139,6 +262,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]


@@ -154,15 +280,27 @@ 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:
     run_list:

-      - recipe[piwik::default]
+      - recipe[php::default]
+  - name: php-apache
+    run_list:
+      - recipe[php::apache]
+  - name: php-fpm
+    run_list:
+      - recipe[php::fpm]

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

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

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


@@ -184,7 +322,23 @@ suites:
     attributes:
       postgresql:
         versions:
     attributes:
       postgresql:
         versions:

-          - 10
+          - 15
+  - name: prometheus
+    run_list:
+      - recipe[prometheus::default]
+    attributes:
+      networking:
+        interfaces:
+          test:
+            interface: eth0
+            role: internal
+            inet:
+              address: 172.18.0.2
+              prefix: 16
+              gateway: 172.18.0.1
+  - name: prometheus-server
+    run_list:
+      - recipe[prometheus::server]

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


@@ -194,18 +348,36 @@ 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:
+      - recipe[ssl::default]
+  - name: stateofthemap-container
+    run_list:
+      - recipe[stateofthemap::container]
+  - name: stateofthemap-wordpress

     run_list:
     run_list:

-      - recipe[squid::default]
-  - name: stateofthemap
+      - recipe[stateofthemap::wordpress]
+  - name: subversion

     run_list:
     run_list:

-      - recipe[stateofthemap::default]
+      - recipe[subversion::default]
+  - name: supybot
+    run_list:
+      - recipe[supybot::default]

   - 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]


@@ -213,18 +385,18 @@ suites:
       taginfo:
         sites:
           - name: taginfo.example.com
       taginfo:
         sites:
           - name: taginfo.example.com

-  - name: tilecache
+  - name: tile
+    run_list:
+      - recipe[tile::default]
+  - name: tilelog

     run_list:
     run_list:

-      - recipe[tilecache::default]
+      - recipe[tilelog::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]


@@ -234,3 +406,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]