linuxmuster-docs · michaelkohls · Oct 3, 2024 · Oct 3, 2024 · Oct 3, 2024
diff --git a/source/systemadministration/schoolconsole/index.rst b/source/systemadministration/schoolconsole/index.rst
diff --git a/source/systemadministration/schoolconsole/media/01_school-console_welcome.png b/source/systemadministration/schoolconsole/media/01_school-console_welcome.png
diff --git a/...ce/systemadministration/schoolconsole/media/02_school-console_user-overview.png b/...ce/systemadministration/schoolconsole/media/02_school-console_user-overview.png
diff --git a/...systemadministration/schoolconsole/media/08_school-console_scale-page-ratio.png b/...systemadministration/schoolconsole/media/08_school-console_scale-page-ratio.png
diff --git a/source/systemadministration/schoolconsole/media/19_school-console_create-user.png b/source/systemadministration/schoolconsole/media/19_school-console_create-user.png
diff --git a/.../systemadministration/schoolconsole/media/25_school-console_device-overview.png b/.../systemadministration/schoolconsole/media/25_school-console_device-overview.png
diff --git a/source/systemadministration/schoolconsole/media/26_school-console_linbo.png b/source/systemadministration/schoolconsole/media/26_school-console_linbo.png
diff --git a/.../systemadministration/schoolconsole/media/30_school-console_quotas-settings.png b/.../systemadministration/schoolconsole/media/30_school-console_quotas-settings.png
diff --git a/.../systemadministration/schoolconsole/media/31_school-console_school-settings.png b/.../systemadministration/schoolconsole/media/31_school-console_school-settings.png
diff --git a/.../systemadministration/schoolconsole/media/33_school-console_global-settings.png b/.../systemadministration/schoolconsole/media/33_school-console_global-settings.png
diff --git a/source/systemadministration/schoolconsole/media/schoolconsole_01_welcome.png b/source/systemadministration/schoolconsole/media/schoolconsole_01_welcome.png
diff --git a/.../media/03_school-console_extend-menue.png → ...e/media/schoolconsole_02_extend-menue.png b/.../media/03_school-console_extend-menue.png → ...e/media/schoolconsole_02_extend-menue.png
diff --git a/...ole/media/04_school-console_user-icon.png → ...sole/media/schoolconsole_03_user-icon.png b/...ole/media/04_school-console_user-icon.png → ...sole/media/schoolconsole_03_user-icon.png
diff --git a/...sole/media/05_school-console_username.png → ...nsole/media/schoolconsole_04_username.png b/...sole/media/05_school-console_username.png → ...nsole/media/schoolconsole_04_username.png
diff --git a/...dia/06_school-console_change-password.png → ...edia/schoolconsole_05_change-password.png b/...dia/06_school-console_change-password.png → ...edia/schoolconsole_05_change-password.png
diff --git a/source/systemadministration/schoolconsole/media/schoolconsole_06_manage-2fa.png b/source/systemadministration/schoolconsole/media/schoolconsole_06_manage-2fa.png
diff --git a/...onsole/media/07_school-console_logout.png → ...console/media/schoolconsole_07_logout.png b/...onsole/media/07_school-console_logout.png → ...console/media/schoolconsole_07_logout.png
diff --git a/.../systemadministration/schoolconsole/media/schoolconsole_08_scale-page-ratio.png b/.../systemadministration/schoolconsole/media/schoolconsole_08_scale-page-ratio.png
diff --git a/...ole/media/10_school-console_dashboard.png → ...sole/media/schoolconsole_09_dashboard.png b/...ole/media/10_school-console_dashboard.png → ...sole/media/schoolconsole_09_dashboard.png
diff --git a/source/systemadministration/schoolconsole/media/schoolconsole_10_filemanager.png b/source/systemadministration/schoolconsole/media/schoolconsole_10_filemanager.png
diff --git a/source/systemadministration/schoolconsole/media/schoolconsole_11_dhcp.png b/source/systemadministration/schoolconsole/media/schoolconsole_11_dhcp.png
diff --git a/source/systemadministration/schoolconsole/media/schoolconsole_12_docker.png b/source/systemadministration/schoolconsole/media/schoolconsole_12_docker.png
diff --git a/source/systemadministration/schoolconsole/media/schoolconsole_13_cron.png b/source/systemadministration/schoolconsole/media/schoolconsole_13_cron.png
diff --git a/source/systemadministration/schoolconsole/media/schoolconsole_14_dns.png b/source/systemadministration/schoolconsole/media/schoolconsole_14_dns.png
diff --git a/...dia/11_school-console_user-management.png → ...media/schoolconsole_15_usermanagement.png b/...dia/11_school-console_user-management.png → ...media/schoolconsole_15_usermanagement.png
diff --git a/...onsole/media/12_school-console_search.png → ...console/media/schoolconsole_16_search.png b/...onsole/media/12_school-console_search.png → ...console/media/schoolconsole_16_search.png
diff --git a/...13_school-console_password-management.png → .../schoolconsole_17_password-management.png b/...13_school-console_password-management.png → .../schoolconsole_17_password-management.png
diff --git a/...console_password-management-all-users.png → ...sole_18_password-management-all-users.png b/...console_password-management-all-users.png → ...sole_18_password-management-all-users.png
diff --git a/...ia/15_school-console_user-information.png → ...dia/schoolconsole_19_user-information.png b/...ia/15_school-console_user-information.png → ...dia/schoolconsole_19_user-information.png
diff --git a/...sole/media/16_school-console_add-user.png → ...nsole/media/schoolconsole_20_add-user.png b/...sole/media/16_school-console_add-user.png → ...nsole/media/schoolconsole_20_add-user.png
diff --git a/...17_school-console_add-user-save-check.png → .../schoolconsole_21_add-user-save-check.png b/...17_school-console_add-user-save-check.png → .../schoolconsole_21_add-user-save-check.png
diff --git a/...edia/18_school-console_check-overview.png → ...media/schoolconsole_22_check-overview.png b/...edia/18_school-console_check-overview.png → ...media/schoolconsole_22_check-overview.png
diff --git a/...dia/20_school-console_import-user-csv.png → ...edia/schoolconsole_23_import-user-csv.png b/...dia/20_school-console_import-user-csv.png → ...edia/schoolconsole_23_import-user-csv.png
diff --git a/...hool-console_import-user-csv-overview.png → ...olconsole_24_import-user-csv-overview.png b/...hool-console_import-user-csv-overview.png → ...olconsole_24_import-user-csv-overview.png
diff --git a/...e/media/22_school-console_delete-user.png → ...le/media/schoolconsole_25_delete-user.png b/...e/media/22_school-console_delete-user.png → ...le/media/schoolconsole_25_delete-user.png
diff --git a/...a/23_school-console_device-management.png → ...ia/schoolconsole_26_device-management.png b/...a/23_school-console_device-management.png → ...ia/schoolconsole_26_device-management.png
diff --git a/...le/media/24_school-console_add-device.png → ...ole/media/schoolconsole_27_add-device.png b/...le/media/24_school-console_add-device.png → ...ole/media/schoolconsole_27_add-device.png
diff --git a/...ce/systemadministration/schoolconsole/media/schoolconsole_27_device-manager.png b/...ce/systemadministration/schoolconsole/media/schoolconsole_27_device-manager.png
diff --git a/...temadministration/schoolconsole/media/schoolconsole_28_client-konfiguration.png b/...temadministration/schoolconsole/media/schoolconsole_28_client-konfiguration.png
diff --git a/...madministration/schoolconsole/media/schoolconsole_29_linbo-synchronisierung.png b/...madministration/schoolconsole/media/schoolconsole_29_linbo-synchronisierung.png
diff --git a/...onsole/media/27_school-console_enrole.png → ...console/media/schoolconsole_30_enrole.png b/...onsole/media/27_school-console_enrole.png → ...console/media/schoolconsole_30_enrole.png
diff --git a/...dia/28_school-console_print-passwords.png → ...media/schoolconsole_31_print-password.png b/...dia/28_school-console_print-passwords.png → ...media/schoolconsole_31_print-password.png
diff --git a/...chool-console_print-passwords-example.png → ...oolconsole_32_print-passwords-example.png b/...chool-console_print-passwords-example.png → ...oolconsole_32_print-passwords-example.png
diff --git a/source/systemadministration/schoolconsole/media/schoolconsole_33_extra-quota.png b/source/systemadministration/schoolconsole/media/schoolconsole_33_extra-quota.png
diff --git a/...e/systemadministration/schoolconsole/media/schoolconsole_34_school-settings.png b/...e/systemadministration/schoolconsole/media/schoolconsole_34_school-settings.png
diff --git a/...e/media/32_school-console_backup-icon.png → ...le/media/schoolconsole_35_backup-icon.png b/...e/media/32_school-console_backup-icon.png → ...le/media/schoolconsole_35_backup-icon.png
diff --git a/...emadministration/schoolconsole/media/schoolconsole_36_globale-einstellungen.png b/...emadministration/schoolconsole/media/schoolconsole_36_globale-einstellungen.png
diff --git a/source/user-management/change-own-password.rst b/source/user-management/change-own-password.rst
@@ -32,11 +32,11 @@ Netzwerkberater. Standardmäßig gibt es folgende Regeln
        a-z A-Z 0-9 ! § + - @ # $ % & * ( )[ ]{ }
 
     (D.h. Umlaute oder diakritische Zeichen sind nicht erlaubt)
-  * Die Mindestlänge des Passwortes sind 7 Zeichen. 
+  * Die Mindestlänge des Passwortes sind 7 Zeichen.
   * Das Passwort muss aus Großbuchstaben, Kleinbuchstaben und entweder
     Zahlen oder Sonderzeichen (oder beidem) bestehen.
 
-    Beispiele sind: ``Muster!`` oder ``HundKatzeMau5``  
+    Beispiele sind: ``Muster!`` oder ``HundKatzeMau5``
 
 Das erfolgreiche Ändern des Passwortes wird mit einer Meldung bestätigt.
 
@@ -60,3 +60,22 @@ Mit dem neuen Passwort kannst Du Dich an allen Diensten anmelden, die
 im Schulnetzwerk mit dem Schulkonto verbunden sind, z.B. auch die
 Anmeldung an PCs.
 
+.. _configure_2FA_label:
+
+Einrichtung 2FA
+===============
+
+Als zusätzliche Absicherung ist die Einrichtung einer Zweifaktorauthentifizierung möglich.
+Dies empfiehlt sich besonders, wenn die Schulkonsole aus dem Internet zugänglich ist.
+Du benötigst eine Authenticator-App. Es eignet sich jede App, welche zeitbegrenzte Einmalpasswörter unterstützt.
+
+Klicke auf den Kontobutton und wähle "2FA".
+
+.. figure:: media/webui-2fa.png
+
+Klicke auf ``TOTP hinzufügen``.
+
+Scanne den QR-Code mit der App und gib die aktuell angezeigt PIN bei ``Überprüfen`` ein. Speichere die Konfiguration.
+
+Sollte das Konto in der Authenticator-App versehentlich gelöscht worden sein, muss die Konfiguration für den betroffenen Benutzer 
+manuell in der Datei ``/etc/ajenti/tfa.yml`` gelöscht werden.
diff --git a/source/user-management/media/webui-2fa.png b/source/user-management/media/webui-2fa.png