better classification

README.md

@@ -15,7 +15,9 @@ Our first abstraction level is the NixOS level, which installs a bunch of standa
   
 Then, inside our Nomad+Consul orchestrator, we deploy a number of base services:
 
-  * **[Garage](https://git.deuxfleurs.fr/Deuxfleurs/garage/):** S3-compatible lightweight object store for self-hosted geo-distributed deployments (we also have a legacy glusterfs cluster)
+  * Data management
+    * **[Garage](https://git.deuxfleurs.fr/Deuxfleurs/garage/):** S3-compatible lightweight object store for self-hosted geo-distributed deployments
+    * **Stolon + PostgreSQL:** distributed relational database
   * Network Control Plane
     * **[DiploNAT](https://git.deuxfleurs.fr/Deuxfleurs/diplonat):** - network automation (firewalling, upnp igd)
     * **[D53](https://git.deuxfleurs.fr/lx/d53)** - update DNS entries (A and AAAA) dynamically based on Nomad service scheduling and local node info
@@ -23,9 +25,9 @@ Then, inside our Nomad+Consul orchestrator, we deploy a number of base services:
     * **[wgautomesh](https://git.deuxfleurs.fr/Deuxfleurs/wgautomesh)** - a dynamic wireguard mesh configurator
   * User Management
     * **[Bottin](https://git.deuxfleurs.fr/Deuxfleurs/bottin):** authentication and authorization (LDAP protocol, consul backend)
-    * **[Guichet](https://git.deuxfleurs.fr/Deuxfleurs/guichet):** a dashboard for our users and administrators
-  * **Stolon + PostgreSQL:** distributed relational database
-  * **Prometheus + Grafana:** monitoring
+    * **[Guichet](https://git.deuxfleurs.fr/Deuxfleurs/guichet):** a dashboard for our users and administrators7
+  * Observability
+    * **Prometheus + Grafana:** monitoring
 
 Some services we provide based on this abstraction: