From 33453d81e37ccd77d643ca2a647fcce3d5e5e469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 21 Feb 2021 16:42:01 +0100
Subject: [PATCH] sysadmin doc: replace references to gunicorn (#51312)

---
 sysadmin-doc/architecture-4.md |  3 +--
 sysadmin-doc/images/schema.svg |  4 ++--
 sysadmin-doc/installation-5.md | 21 ++++++++++++---------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/sysadmin-doc/architecture-4.md b/sysadmin-doc/architecture-4.md
index dfeb11b..c5b3afc 100644
--- a/sysadmin-doc/architecture-4.md
+++ b/sysadmin-doc/architecture-4.md
@@ -12,8 +12,7 @@ d’exploitation Debian GNU/Linux en version stable (oldstable est supporté ég
 
 Le frontal web recommandé est nginx, bien que Publik puisse fonctionner
 avec Apache et d’autres serveurs HTTP. La liaison entre les applicatifs
-Python et le frontal web est assurée par gunicorn (évolution en cours
-vers uwgsi).
+Python et le frontal web est assurée par uWSGI.
 
 Les différents composants (briques) de Publik échangent des messages
 AMQP via RabbitMQ.
diff --git a/sysadmin-doc/images/schema.svg b/sysadmin-doc/images/schema.svg
index 54a6144..4f54592 100644
--- a/sysadmin-doc/images/schema.svg
+++ b/sysadmin-doc/images/schema.svg
@@ -142,7 +142,7 @@
       <g id="id6">
        <rect class="BoundingBox" stroke="none" fill="none" x="7982" y="10982" width="6037" height="2037"/>
        <path fill="none" stroke="rgb(0,0,0)" stroke-width="35" stroke-linejoin="round" d="M 11000,13000 L 8000,13000 8000,11000 14000,11000 14000,13000 11000,13000 Z"/>
-       <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="494px" font-weight="400"><tspan class="TextPosition" x="9466" y="11935"><tspan fill="rgb(0,0,0)" stroke="none">Interface wsgi</tspan></tspan></tspan><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9466" y="12426"><tspan fill="rgb(0,0,0)" stroke="none">gunicorn / uwsgi</tspan></tspan></tspan></text>
+       <text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="494px" font-weight="400"><tspan class="TextPosition" x="9466" y="11935"><tspan fill="rgb(0,0,0)" stroke="none">Interface wsgi</tspan></tspan></tspan><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="423px" font-weight="400"><tspan class="TextPosition" x="9466" y="12426"><tspan fill="rgb(0,0,0)" stroke="none">uWSGI</tspan></tspan></tspan></text>
       </g>
      </g>
      <g class="com.sun.star.drawing.CustomShape">
@@ -1726,4 +1726,4 @@
    </g>
   </g>
  </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/sysadmin-doc/installation-5.md b/sysadmin-doc/installation-5.md
index fd487d4..5fe6493 100644
--- a/sysadmin-doc/installation-5.md
+++ b/sysadmin-doc/installation-5.md
@@ -213,15 +213,18 @@ configuration mail :
 Vérification avec *service authentic2-multitenant status* :
 
     # systemctl status authentic2-multitenant
-    ● authentic2-multitenant.service - LSB: Authentic2 is a versatile identity provider
-     Loaded: loaded (/etc/init.d/authentic2-multitenant)
-     Active: active (running) since jeu. 2017-07-20 18:48:47 CEST; 24h ago
-     CGroup: /system.slice/authentic2-multitenant.service
-     ├─21361 /usr/bin/python /usr/bin/gunicorn --pid /var/run/authentic2-multitenant/authentic2-multitenant.pid --user authentic-multitenant --group authentic-m...
-     ├─21372 /usr/bin/python /usr/bin/gunicorn --pid /var/run/authentic2-multitenant/authentic2-multitenant.pid --user authentic-multitenant --group authentic-m...
-     ├─21377 /usr/bin/python /usr/bin/gunicorn --pid /var/run/authentic2-multitenant/authentic2-multitenant.pid --user authentic-multitenant --group authentic-m...
-     ├─21380 /usr/bin/python /usr/bin/gunicorn --pid /var/run/authentic2-multitenant/authentic2-multitenant.pid --user authentic-multitenant --group authentic-m...
-     └─25604 /usr/bin/python /usr/bin/gunicorn --pid /var/run/authentic2-multitenant/authentic2-multitenant.pid --user authentic-multitenant --group authentic-m...
+    ● authentic2-multitenant.service - Authentic 2 (multitenants)
+       Loaded: loaded (/lib/systemd/system/authentic2-multitenant.service; enabled; vendor preset: enabled)
+       Active: active (running) since Fri 2021-02-19 08:49:27 CET; 2 days ago
+     Main PID: 11591 (uwsgi)
+       Status: "uWSGI is ready"
+       CGroup: /system.slice/authentic2-multitenant.service
+               ├─ 9944 authentic2-multitenant uWSGI worker 6
+               ├─ 9946 authentic2-multitenant uWSGI worker 7
+               ├─ 9949 authentic2-multitenant uWSGI worker 8
+               ├─ 9950 authentic2-multitenant uWSGI worker 9
+               ├─11083 authentic2-multitenant uWSGI worker 10
+               └─11591 authentic2-multitenant uWSGI master
 
 ## Installation w.c.s.