docker-compose: move configuration files to config/

.github/workflows/ci.yml

@@ -201,7 +201,7 @@ jobs:
           tar zcvf docker-compose-quickstart.tar.gz \
             docker-compose.yml docker-compose-demo.yml .env \
             orchestrator/clickhouse/data/docker-entrypoint.sh \
-            akvorado*.yaml
+            config/*.yaml
 
       # Publish release
       - name: Publish release

cmd/testdata/configurations/shipped/in.yaml

@@ -1 +1 @@
-../../../../akvorado.yaml
+../../../../config/akvorado.yaml

config/akvorado.yaml

@@ -57,8 +57,8 @@ clickhouse:
     #     .prefixes[] |
     #     { prefix: (.ipv4Prefix // .ipv6Prefix), tenant: "google-cloud", region: .scope }
 
-inlet: !include "akvorado-inlet.yaml"
-console: !include "akvorado-console.yaml"
+inlet: !include "inlet.yaml"
+console: !include "console.yaml"
 
 # Remove the following line if you don't want to get demo data
-demo-exporter: !include "akvorado-demo.yaml"
+demo-exporter: !include "demo.yaml"

console/data/docs/00-intro.md

@@ -49,7 +49,7 @@ documentation.
 
 You can get all the expanded configuration (with default values) with
 `docker-compose exec akvorado-orchestrator akvorado orchestrator
---check --dump /etc/akvorado.yaml`.
+--check --dump /etc/akvorado/akvorado.yaml`.
 
 Take a look at the `docker-compose.yml` file if you want to setup the
 GeoIP database. It requires two environment variables to fetch them

console/data/docs/02-configuration.md

@@ -1,9 +1,9 @@
 # Configuration
 
-The orchestrator service is configured through a YAML file and
-includes the configuration of the other services. Other services are
-expected to query the orchestrator through HTTP on start to retrieve
-their configuration.
+The orchestrator service is configured through YAML files (shipped in the
+`config/` directory) and includes the configuration of the other services. Other
+services are expected to query the orchestrator through HTTP on start to
+retrieve their configuration.
 
 The default configuration can be obtained with `docker-compose exec
 akvorado-orchestrator akvorado orchestrator --dump --check /dev/null`. Note that

console/data/docs/99-changelog.md

@@ -13,7 +13,9 @@ identified with a specific icon:
 
 ## Unreleased
 
-- 🌱 *common*: accept an `!include` tag to include other YAML files in `akvorado.yaml`
+- 💥 *docker-compose*: the configuration files are now shipped in a `config/`
+  directory: you need to move your `akvorado.yaml` in `config/` as well
+- 🌱 *orchestrator*: accept an `!include` tag to include other YAML files in `akvorado.yaml`
 
 ## 1.7.2 - 2023-02-12
 

docker-compose.yml

@@ -69,9 +69,9 @@ services:
   akvorado-orchestrator:
     <<: *akvorado-image
     restart: unless-stopped
-    command: orchestrator /etc/akvorado.yaml
+    command: orchestrator /etc/akvorado/akvorado.yaml
     volumes:
-      - ./akvorado.yaml:/etc/akvorado.yaml:ro
+      - ./config:/etc/akvorado:ro
     labels:
       - traefik.enable=true
       - traefik.http.routers.akvorado-orchestrator.entrypoints=private # it exposes configuration files with passwords