summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/glossary.rst23
-rw-r--r--docs/index.rst1
-rw-r--r--docs/people.rst93
-rw-r--r--docs/systems/arbitration.rst9
-rw-r--r--docs/systems/blog.rst52
-rw-r--r--docs/systems/board.rst14
-rw-r--r--docs/systems/infra02.rst12
7 files changed, 148 insertions, 56 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 02977b4..047a245 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -2,6 +2,7 @@ Glossary
========
.. glossary::
+ :sorted:
LXC
`Linux Containers <https://linuxcontainers.org/>`_
@@ -20,3 +21,25 @@ Glossary
reboot. LVM provides snapshot functionality that is useful for backup and
upgrade procedures.
+ Infrastructure Team Lead
+ This person is appointed to coordinate the non-critical infrastructure
+ team by a board motion. The Infrastructure Team Lead works with
+ :term:`Infrastructure Administrators <Infrastructure Administrator>` and
+ the :term:`Critical System Administrators <Critical System
+ Administrator>`.
+
+ Infrastructure Administrator
+ Infrastructure Administrators have :program:`sudo` access to one or
+ multiple infrastructure systems. Most of them are :term:`Application
+ Administrators <Application Administrator>` too.
+
+ Critical System Administrator
+ The Critical System Administrators take care of the critical systems
+ required for the CA and RA operation, they have access to the Internet
+ firewall and DNS setup.
+
+ Application Administrator
+ An Application Administrator takes care of the functionality of one or
+ more server applications. Application Administrators do not necessarily
+ need system level access if the managed application has other means of
+ administration, for example a web based administration frontend.
diff --git a/docs/index.rst b/docs/index.rst
index bff2526..fb12ddd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,6 +20,7 @@ Contents:
iplist
sshkeys
certlist
+ people
glossary
building
diff --git a/docs/people.rst b/docs/people.rst
new file mode 100644
index 0000000..f68b593
--- /dev/null
+++ b/docs/people.rst
@@ -0,0 +1,93 @@
+===========
+People list
+===========
+
+.. _people_abahlo:
+
+Alexander Bahlo
+===============
+
+:roles: :term:`Application Administrator` on :doc:`systems/blog`
+:contact: alexander.bahlo@cacert.org
+
+.. _people_jandd:
+
+Jan Dittberner
+==============
+
+:roles: :term:`Infrastructure Team Lead`, :term:`Infrastructure Administrator`
+:contact: jandd@cacert.org
+:wiki: https://wiki.cacert.org/JanDittberner
+:irc: jandd
+
+.. _people_martin:
+
+Martin Gummi
+============
+
+:roles: :term:`Infrastructure Administrator`
+:contact: martin.gummi@cacert.org
+
+.. _people_mario:
+
+Mario Lipinski
+==============
+
+:roles: :term:`Infrastructure Administrator`, former Team Lead
+:contact: mario@cacert.org
+
+.. _people_marcus:
+
+Marcus Mängel
+=============
+
+:roles: :term:`Application Administrator` on :doc:`systems/blog`
+:contact: marcus.maengel@cacert.org
+
+.. _people_mendel:
+
+Mendel Mobach
+=============
+
+:roles: :term:`Critical System Administrator`
+:contact: mendel@cacert.org
+
+.. _people_neo:
+
+Michael Tänzer
+==============
+
+:roles: :term:`Infrastructure Administrator`
+:contact: michael.taenzer@cacert.org
+
+.. _people_gero:
+
+Gero Treuner
+============
+
+:roles: :term:`Infrastructure Administrator`
+:contact: gero.treuner@cacert.org
+
+.. _people_ulrich:
+
+Ulrich Schröter
+===============
+
+:roles: :term:`Infrastructure Administrator`
+:contact: ulrich@cacert.org
+
+.. _people_jselzer:
+
+Jochim Selzer
+=============
+
+:roles: :term:`Infrastructure Administrator`
+:contact: jselzer@cacert.org
+
+.. _people_wytze:
+
+Wytze van der Raay
+==================
+
+:roles: :term:`Critical System Administrator`
+:contact: wytze@cacert.org
diff --git a/docs/systems/arbitration.rst b/docs/systems/arbitration.rst
index 8b38813..91ecff5 100644
--- a/docs/systems/arbitration.rst
+++ b/docs/systems/arbitration.rst
@@ -16,13 +16,11 @@ Administration
System Administration
---------------------
-* Primary: `Martin Gummi`_
+* Primary: :ref:`people_martin`
* Secondary: None
.. todo:: find an additional admin
-.. _Martin Gummi: martin.gummi@cacert.org
-
Application Administration
--------------------------
@@ -40,12 +38,9 @@ Contact
Additional People
-----------------
-`Jan Dittberner`_ and `Mario Lipinski`_ have :program:`sudo` access on that
+:ref:`people_jandd` and :ref:`people_mario` have :program:`sudo` access on that
machine too.
-.. _Jan Dittberner: jandd@cacert.org
-.. _Mario Lipinski: mario@cacert.org
-
Basics
======
diff --git a/docs/systems/blog.rst b/docs/systems/blog.rst
index 33c3811..890fdd0 100644
--- a/docs/systems/blog.rst
+++ b/docs/systems/blog.rst
@@ -17,38 +17,33 @@ Administration
System Administration
---------------------
-* Primary: `Martin Gummi`_
+* Primary: :ref:`people_martin`
* Secondary: None
.. todo:: find an additional admin
-.. _Martin Gummi: martin.gummi@cacert.org
-
Application Administration
--------------------------
-+-----------------------+---------------------------------------------------+
-| Role | Users |
-+=======================+===================================================+
-| Wordpress Admin | * `Alexander Bahlo`_ |
-| | * `Marcus Mängel`_ |
-| | * `Mario Lipinski`_ |
-| | * `Martin Gummi`_ |
-+-----------------------+---------------------------------------------------+
-| Wordpress Editor | * PR Team |
-| | * `Support`_ |
-+-----------------------+---------------------------------------------------+
-| Wordpress Author | * Anyone with a certificate |
-+-----------------------+---------------------------------------------------+
-| Wordpress Contributor | * Anyone with contributor privileges |
-+-----------------------+---------------------------------------------------+
-| Wordpress Subscriber | * Any Spammer or person who has not posted or has |
-| | not logged in |
-+-----------------------+---------------------------------------------------+
-
-.. _Alexander Bahlo: alexander.bahlo@cacert.org
-.. _Marcus Mängel: markus.maengel@cacert.org
-.. _Mario Lipinski: mario@cacert.org
++-----------------------+-------------------------------------------------+
+| Role | Users |
++=======================+=================================================+
+| Wordpress Admin | :ref:`people_abahlo`, |
+| | :ref:`people_marcus`, |
+| | :ref:`people_mario`, |
+| | :ref:`people_martin` |
++-----------------------+-------------------------------------------------+
+| Wordpress Editor | PR Team, |
+| | `Support`_ |
++-----------------------+-------------------------------------------------+
+| Wordpress Author | Anyone with a certificate |
++-----------------------+-------------------------------------------------+
+| Wordpress Contributor | Anyone with contributor privileges |
++-----------------------+-------------------------------------------------+
+| Wordpress Subscriber | Any Spammer or person who has not posted or has |
+| | not logged in |
++-----------------------+-------------------------------------------------+
+
.. _Support: support@cacert.org
Contact
@@ -59,11 +54,8 @@ Contact
Additional People
-----------------
-`Jan Dittberner`_ and `Mario Lipinski`_ have :program:`sudo` access on that
-machine too.
-
-.. _Jan Dittberner: jandd@cacert.org
-.. _Mario Lipinski: mario@cacert.org
+:ref:`Jan Dittberner <people_jandd>` and :ref:`Mario Lipinski <people_mario>`
+have :program:`sudo` access on that machine too.
Basics
======
diff --git a/docs/systems/board.rst b/docs/systems/board.rst
index eace202..fd4b032 100644
--- a/docs/systems/board.rst
+++ b/docs/systems/board.rst
@@ -16,17 +16,15 @@ Administration
System Administration
---------------------
-* Primary: `Gero Treuner`_
+* Primary: :ref:`people_gero`
* Secondary: None
.. todo:: find an additional admin
-.. _Gero Treuner: gero.treuner@cacert.org
-
Application Administration
--------------------------
-* OpenERP: `Gero Treuner`_, `Michael Tänzer`_, Treasurer
+* OpenERP: :ref:`people_gero`, :ref:`people_neo`, Treasurer
.. note:: use personalized accounts only
@@ -38,12 +36,8 @@ Contact
Additional People
-----------------
-`Jan Dittberner`_, `Mario Lipinski`_ and `Michael Tänzer`_ have :program:`sudo`
-access on that machine too.
-
-.. _Jan Dittberner: jandd@cacert.org
-.. _Mario Lipinski: mario@cacert.org
-.. _Michael Tänzer: michael.taenzer@cacert.org
+:ref:`people_jandd`, :ref:`people_mario` and :ref:`people_neo` have
+:program:`sudo` access on that machine too.
Basics
======
diff --git a/docs/systems/infra02.rst b/docs/systems/infra02.rst
index eb521b7..6e3fd81 100644
--- a/docs/systems/infra02.rst
+++ b/docs/systems/infra02.rst
@@ -27,11 +27,8 @@ Administration
System Administration
---------------------
-* Primary: `Jan Dittberner`_
-* Secondary: `Mario Lipinski`_
-
-.. _Jan Dittberner: jandd@cacert.org
-.. _Mario Lipinski: mario@cacert.org
+* Primary: :ref:`people_jandd`
+* Secondary: :ref:`people_mario`
Contact
-------
@@ -41,12 +38,9 @@ Contact
Additional People
-----------------
-`Wytze van der Raay`_ and `Mendel Mobach`_ have :program:`sudo` access on that
+:ref:`people_wytze` and :ref:`people_mendel` have :program:`sudo` access on that
machine too.
-.. _Wytze van der Raay: wytze@cacert.org
-.. _Mendel Mobach: mendel@cacert.org
-
Basics
======