Update the diagrams

camptocamp · Oct 11, 2022 · 17119d9 · 17119d9
1 parent 54a7e79
commit 17119d9
Show file tree

Hide file tree

Showing 7 changed files with 108 additions and 9 deletions.
diff --git a/admin/config.yaml b/admin/config.yaml
@@ -62,7 +62,7 @@ vars:
         relevant_for:
           - layergroup
       # Layer
-      - name: copyable
+      - name: copiable
         type: boolean
         description: >
           Whether the geometry from this data source can be copied to other data sources or not.

diff --git a/doc/conf.py b/doc/conf.py
@@ -37,6 +37,7 @@
     "sphinxarg.ext",
     "sphinx.ext.extlinks",
     "sphinx_substitution_extensions",
+    "sphinxcontrib.mermaid",
 ]
 
 # Add any paths that contain templates here, relative to this directory.

diff --git a/doc/integrator/docker-apache.dia b/doc/integrator/docker-apache.dia
diff --git a/doc/integrator/docker-apache.png b/doc/integrator/docker-apache.png
diff --git a/doc/integrator/docker-openshift.dia b/doc/integrator/docker-openshift.dia
diff --git a/doc/integrator/docker-openshift.png b/doc/integrator/docker-openshift.png
diff --git a/doc/integrator/docker.rst b/doc/integrator/docker.rst
@@ -8,14 +8,112 @@ Architecture schema
 
 For OpenShift projects:
 
-.. image:: docker-openshift.png
-.. source file is docker-openshift.dia.
-
-For stand alone projects:
-
-.. image:: docker-apache.png
-.. source file is docker-apache.dia.
-
+.. mermaid::
+
+    graph LR
+
+        client(Web client);
+
+        k8s[Kubernetes routing];
+        geoportal[GeoMapFish server<br>camptocamp/geomapfishapp-geoportal];
+        tcc[TileCloud-chain<br>camptocamp/tilecloud-chain];
+        tccs[TileCloud-chain slave<br>camptocamp/tilecloud-chain];
+        mapserver[MapServer<br>camptocamp/mapserver<br>or/and<br>camptocamp/qgis-server];
+        tinyows[tinyows];
+        print[Mapfist Print<br>camptocamp/mapfish-print];
+        alembic[GeoMapFish alembic<br>camptocamp/geomapfishapp-geoportal<br>minor databage upgrade];
+        config[Project config<br>camtocamp/%project%-config<br>injected the config in all the containers];
+        tools[GeoMapFish tools<br>camptocamp/geomapfishapp-tools];
+
+        redis[(Redis)];
+        redis:::data;
+
+
+        postgres[(Postgres)];
+        postgres:::data;
+        storage[(Object staorage)];
+        storage:::data;
+
+        client ==> k8s;
+        k8s ==> geoportal;
+        k8s ==> tcc;
+        geoportal --> tinyows;
+        geoportal ==> mapserver;
+        geoportal -. cache, broadcast .-> redis;
+        geoportal -.-> postgres;
+        geoportal -. raster data .-> storage;
+        tcc -- on the fly --> mapserver;
+        tccs -- pregenertation --> mapserver;
+        tcc -. queue .-> redis;
+        tccs -. queue .-> redis;
+        tcc -. tiles .-> storage;
+        tccs -. tiles .-> storage;
+        geoportal --> print;
+        print --> geoportal;
+        alembic -.-> postgres;
+        mapserver -.-> postgres;
+        mapserver -.-> storage;
+        tinyows -.-> postgres;
+
+        classDef data fill:#5ba6ff,color:black;
+For standalone projects:
+
+.. mermaid::
+
+    graph LR
+
+        client(Web client);
+
+        apache[Apache];
+        subgraph Project composition
+        haproxy[haproxy];
+        geoportal[GeoMapFish server<br>camptocamp/geomapfishapp-geoportal];
+        tcc[TileCloud-chain<br>camptocamp/tilecloud-chain];
+        tccs[TileCloud-chain slave<br>camptocamp/tilecloud-chain];
+        mapserver[MapServer<br>camptocamp/mapserver<br>or/and<br>camptocamp/qgis-server];
+        tinyows[tinyows];
+        print[Mapfist Print<br>camptocamp/mapfish-print];
+        alembic[GeoMapFish alembic<br>camptocamp/geomapfishapp-geoportal<br>minor databage upgrade];
+        config[Project config<br>camtocamp/%project%-config<br>injected the config in all the containers];
+        tools[GeoMapFish tools<br>camptocamp/geomapfishapp-tools];
+
+        redis[(Redis)];
+        redis:::data;
+        end
+
+        subgraph Second project composition
+        haproxy2[haproxy];
+        end
+
+        postgres[(Postgres)];
+        postgres:::data;
+        storage[(File system)];
+        storage:::data;
+
+        client ==> apache;
+        apache ==> haproxy;
+        apache ==> haproxy2;
+        haproxy ==> geoportal;
+        haproxy ==> tcc;
+        geoportal --> tinyows;
+        geoportal ==> mapserver;
+        geoportal -. cache, broadcast .-> redis;
+        geoportal -.-> postgres;
+        geoportal -. raster data .-> storage;
+        tcc -- on the fly --> mapserver;
+        tccs -- pregenertation --> mapserver;
+        tcc -. queue .-> redis;
+        tccs -. queue .-> redis;
+        tcc -. tiles .-> storage;
+        tccs -. tiles .-> storage;
+        geoportal --> print;
+        print --> geoportal;
+        alembic -.-> postgres;
+        mapserver -.-> postgres;
+        mapserver -.-> storage;
+        tinyows -.-> postgres;
+
+        classDef data fill:#5ba6ff,color:black;
 
 Docker Images
 -------------