From 03765d404176810a7241c067dd815b38cef944c8 Mon Sep 17 00:00:00 2001
From: Marc Beninca <cnam@marc-beninca.fr>
Date: Fri, 30 Oct 2020 10:48:26 +0100
Subject: [PATCH] gpg

---
 cnam/{ => gpg}/gpg.asc         |  0
 cnam/gpg/index.rst             | 22 ++++++++++++++++++++++
 cnam/index.rst                 |  3 +++
 cnam/probatoire/probatoire.rst | 23 -----------------------
 4 files changed, 25 insertions(+), 23 deletions(-)
 rename cnam/{ => gpg}/gpg.asc (100%)
 create mode 100644 cnam/gpg/index.rst

diff --git a/cnam/gpg.asc b/cnam/gpg/gpg.asc
similarity index 100%
rename from cnam/gpg.asc
rename to cnam/gpg/gpg.asc
diff --git a/cnam/gpg/index.rst b/cnam/gpg/index.rst
new file mode 100644
index 0000000..106848c
--- /dev/null
+++ b/cnam/gpg/index.rst
@@ -0,0 +1,22 @@
+Clé publique
+============
+
+Serveurs HKPS
+-------------
+
+* `keyserver.ubuntu.com <https://keyserver.ubuntu.com/pks/lookup?search=0x1dbd5ec4bada5579&fingerprint=on&op=index>`_
+* `pgp.rediris.es <https://pgp.rediris.es/pks/lookup?search=0x1dbd5ec4bada5579&fingerprint=on>`_
+* `pgp.surf.nl <https://pgp.surf.nl/pks/lookup?search=0x1dbd5ec4bada5579&fingerprint=on>`_
+* `pgp.key-server.io <https://pgp.key-server.io/pks/lookup?search=0x1dbd5ec4bada5579&fingerprint=on>`_
+* `peegeepee.com <https://peegeepee.com/08EDA7006234A0EB29A3A8471DBD5EC4BADA5579>`_
+
+Serveur OpenPGP
+---------------
+
+* `keys.openpgp.org <https://keys.openpgp.org/search?q=cnam%40marc-beninca.fr>`_
+
+Téléchargement direct
+---------------------
+
+* :download:`meta.sr.ht <https://meta.sr.ht/~mspe.pgp>`
+* :download:`cnam.marc-beninca.fr <../gpg.asc>`
diff --git a/cnam/index.rst b/cnam/index.rst
index db7938d..bd9a901 100644
--- a/cnam/index.rst
+++ b/cnam/index.rst
@@ -4,13 +4,16 @@ CNAM
 .. image:: cnam.png
 
 .. toctree::
+   :caption: Travaux
    :maxdepth: 2
 
    thesis/index
    probatoire/index
    blanc/index
+   gpg/index
 
 .. toctree::
+   :caption: Ressources
    :maxdepth: 2
 
    documents/index
diff --git a/cnam/probatoire/probatoire.rst b/cnam/probatoire/probatoire.rst
index d34ffe9..203c412 100644
--- a/cnam/probatoire/probatoire.rst
+++ b/cnam/probatoire/probatoire.rst
@@ -19,26 +19,3 @@ Signatures numériques
 * :download:`Présentation <présentation.pdf.asc>`
 
 .. literalinclude:: présentation.pdf.vrf
-
-Clé publique personnelle
-========================
-
-Serveurs HKPS
--------------
-
-* `keyserver.ubuntu.com <https://keyserver.ubuntu.com/pks/lookup?search=0x1dbd5ec4bada5579&fingerprint=on&op=index>`_
-* `pgp.rediris.es <https://pgp.rediris.es/pks/lookup?search=0x1dbd5ec4bada5579&fingerprint=on>`_
-* `pgp.surf.nl <https://pgp.surf.nl/pks/lookup?search=0x1dbd5ec4bada5579&fingerprint=on>`_
-* `pgp.key-server.io <https://pgp.key-server.io/pks/lookup?search=0x1dbd5ec4bada5579&fingerprint=on>`_
-* `peegeepee.com <https://peegeepee.com/08EDA7006234A0EB29A3A8471DBD5EC4BADA5579>`_
-
-Serveur OpenPGP
----------------
-
-* `keys.openpgp.org <https://keys.openpgp.org/search?q=cnam%40marc-beninca.fr>`_
-
-Serveur personnel
------------------
-
-* :download:`meta.sr.ht <https://meta.sr.ht/~mspe.pgp>`
-* :download:`cnam.marc-beninca.fr <../gpg.asc>`