[Web] Implement XMPP

[Web] Various small fixes and enhancements
2021-02-11 09:34:21 +01:00
parent e51479700b
commit 06c89bac7d
24 changed files with 1093 additions and 677 deletions
--- a/data/web/lang/lang.cs.json
+++ b/data/web/lang/lang.cs.json
@@ -435,12 +435,12 @@
        "logs": "Logy",
        "restart_container": "Restartovat",
        "solr_dead": "Solr se spouští, je vypnutý nebo spadl.",
-        "solr_docs": "Dokumentace",
-        "solr_last_modified": "Naposledy změněn",
-        "solr_size": "Velikost",
-        "solr_started_at": "Spuštěn",
+        "docs": "Dokumentace",
+        "last_modified": "Naposledy změněn",
+        "size": "Velikost",
+        "started_at": "Spuštěn",
        "solr_status": "Stav Solr",
-        "solr_uptime": "Doba běhu",
+        "uptime": "Doba běhu",
        "started_on": "Spuštěno",
        "static_logs": "Statické logy",
        "system_containers": "Systém a kontejnery"
--- a/data/web/lang/lang.de.json
+++ b/data/web/lang/lang.de.json
@@ -26,7 +26,10 @@
        "syncjobs": "Sync Jobs",
        "tls_policy": "Verschlüsselungsrichtlinie",
        "unlimited_quota": "Unendliche Quota für Mailboxen",
-        "domain_desc": "Domainbeschreibung ändern"
+        "domain_desc": "Domainbeschreibung ändern",
+        "xmpp_admin": "Benutzer zum XMPP-Administrator ernennen",
+        "xmpp_access": "XMPP-Zugang eines Benutzers einstellen",
+        "xmpp_prefix": "XMPP-Subdomain ändern"
    },
    "add": {
        "activate_filter_warn": "Alle anderen Filter diesen Typs werden deaktiviert, falls dieses Script aktiv markiert wird.",
@@ -59,6 +62,14 @@
        "full_name": "Vor- und Nachname",
        "gal": "Globales Adressbuch",
        "gal_info": "Das globale Adressbuch enthält alle Objekte einer Domain und kann durch keinen Benutzer geändert werden. Die Verfügbarkeitsinformation in SOGo ist nur bei eingeschaltetem globalen Adressbuch ersichtlich! <b>Zum Anwenden einer Änderung muss SOGo neugestartet werden.</b>",
+        "xmpp": "XMPP für diese Domain aktivieren",
+        "xmpp_prefix": "XMPP-Prefix für Domain (\"im\" für <b>im</b>.example.org)",
+        "xmpp_prefix_info": "Für die Bereitstellung eines Zertifikates sollte vorab ein DNS-Eintrag, etwa in Form eines CNAMEs, für <b>im</b>.example.org sowie <b>*.im</b>.example.org auf <b>%s</b> zeigend angelegt werden. Im Anschluss an die Aktivierung sollte der DNS-Check für diese Domain ausgeführt werden.",
+        "xmpp_info": "Diese Funktion stellt eine Chat-Funktionalität für die Domain bereit.",
+        "xmpp_access": "XMPP Zugang",
+        "xmpp_access_info": "XMPP muss für diese Domain aktiviert sein.",
+        "xmpp_admin": "XMPP Administrator",
+        "xmpp_admin_info": "<b>Vorsicht:</b> Ernennt den Benutzer zum Administrator der jeweiligen XMPP Domain.",
        "generate": "generieren",
        "goto_ham": "Nachrichten als <span class=\"text-success\"><b>Ham</b></span> lernen",
        "goto_null": "Nachrichten sofort verwerfen",
@@ -350,6 +361,7 @@
        "global_filter_write_error": "Kann Filterdatei nicht schreiben: %s",
        "global_map_invalid": "Rspamd Map %s ist ungültig",
        "global_map_write_error": "Kann globale Map ID %s nicht schreiben: %s",
+        "xmpp_map_write_error": "Kann XMPP Map nicht schreiben: %s",
        "goto_empty": "Eine Alias-Adresse muss auf mindestens eine gütlige Ziel-Adresse zeigen",
        "goto_invalid": "Ziel-Adresse %s ist ungültig",
        "ham_learn_error": "Ham Lernfehler: %s",
@@ -434,7 +446,9 @@
        "username_invalid": "Benutzername %s kann nicht verwendet werden",
        "validity_missing": "Bitte geben Sie eine Gültigkeitsdauer an",
        "value_missing": "Bitte alle Felder ausfüllen",
-        "yotp_verification_failed": "Yubico OTP-Verifizierung fehlgeschlagen: %s"
+        "yotp_verification_failed": "Yubico OTP-Verifizierung fehlgeschlagen: %s",
+        "xmpp_restart_failed": "XMPP konnte nicht neu gestartet werden",
+        "xmpp_reload_failed": "XMPP konnte nicht neu geladen werden"
    },
    "debug": {
        "chart_this_server": "Chart (dieser Server)",
@@ -448,15 +462,18 @@
        "logs": "Protokolle",
        "restart_container": "Neustart",
        "solr_dead": "Solr startet, ist deaktiviert oder temporär nicht erreichbar.",
-        "solr_docs": "Dokumente",
-        "solr_last_modified": "Zuletzt geändert",
-        "solr_size": "Größe",
-        "solr_started_at": "Gestartet am",
+        "xmpp_dead": "XMPP startet, ist deaktiviert oder temporär nicht erreichbar.",
+        "docs": "Dokumente",
+        "last_modified": "Zuletzt geändert",
+        "online_users": "Benutzer online",
+        "size": "Größe",
+        "started_at": "Gestartet am",
        "solr_status": "Solr Status",
-        "solr_uptime": "Uptime",
+        "uptime": "Uptime",
        "started_on": "Gestartet am",
        "static_logs": "Statische Logs",
-        "system_containers": "System & Container"
+        "system_containers": "System & Container",
+        "xmpp_status": "XMPP Status"
    },
    "diagnostics": {
        "cname_from_a": "Wert abgeleitet von A/AAAA-Eintrag. Wird unterstützt, sofern der Eintrag auf die korrekte Ressource zeigt.",
@@ -505,6 +522,14 @@
        "full_name": "Voller Name",
        "gal": "Globales Adressbuch",
        "gal_info": "Das globale Adressbuch enthält alle Objekte einer Domain und kann durch keinen Benutzer geändert werden. Die Verfügbarkeitsinformation in SOGo ist nur bei eingeschaltetem globalen Adressbuch ersichtlich <b>Zum Anwenden einer Änderung muss SOGo neugestartet werden.</b>",
+        "xmpp": "XMPP für diese Domain aktivieren",
+        "xmpp_prefix": "XMPP-Prefix für Domain (\"im\" für <b>im</b>.example.org)",
+        "xmpp_prefix_info": "Für die Bereitstellung eines Zertifikates sollte vorab ein DNS-Eintrag, etwa in Form eines CNAMEs, für <b>im</b>.example.org sowie <b>*.im</b>.example.org auf <b>%s</b> zeigend angelegt werden. Im Anschluss an die Aktivierung sollte der DNS-Check für diese Domain ausgeführt werden.",
+        "xmpp_info": "Diese Funktion stellt eine Chat-Funktionalität für die Domain bereit.",
+        "xmpp_access": "XMPP Zugang",
+        "xmpp_access_info": "XMPP muss für diese Domain aktiviert sein.",
+        "xmpp_admin": "XMPP Administrator",
+        "xmpp_admin_info": "<b>Vorsicht:</b> Ernennt den Benutzer zum Administrator der jeweiligen XMPP Domain.",
        "generate": "generieren",
        "grant_types": "Grant types",
        "hostname": "Servername",
@@ -536,6 +561,7 @@
        "pushover_vars": "Wenn kein Sender-Filter definiert ist, werden alle E-Mails berücksichtigt.<br>Die direkte Absenderprüfung und reguläre Ausdrücke werden unabhängig voneinander geprüft, sie <b>hängen nicht voneinander ab</b> und werden der Reihe nach ausgeführt. <br>Verwendbare Variablen für Titel und Text (Datenschutzrichtlinien beachten)",
        "pushover_verify": "Verbindung verifizieren",
        "quota_mb": "Speicherplatz (MiB)",
+        "ratelimit": "Rate Limit",
        "redirect_uri": "Redirect/Callback-URL",
        "relay_all": "Alle Empfänger-Adressen relayen",
        "relay_all_info": "↪ Wenn <b>nicht</b> alle Empfänger-Adressen relayt werden sollen, müssen \"blinde\" Mailboxen für jede Adresse, die relayt werden soll, erstellen werden.",
@@ -558,6 +584,7 @@
        "sogo_visible": "Alias in SOGo sichtbar",
        "sogo_visible_info": "Diese Option hat lediglich Einfluss auf Objekte, die in SOGo darstellbar sind (geteilte oder nicht-geteilte Alias-Adressen mit dem Ziel mindestens einer lokalen Mailbox).",
        "spam_alias": "Anpassen temporärer Alias-Adressen",
+        "spam_filter": "Spamfilter",
        "spam_policy": "Hinzufügen und Entfernen von Einträgen in White- und Blacklists",
        "spam_score": "Einen benutzerdefiniterten Spam-Score festlegen",
        "subfolder2": "Ziel-Ordner<br><small>(leer = kein Unterordner)</small>",
@@ -891,7 +918,10 @@
        "verified_totp_login": "TOTP-Anmeldung verifiziert",
        "verified_u2f_login": "U2F-Anmeldung verifiziert",
        "verified_fido2_login": "FIDO2-Anmeldung verifiziert",
-        "verified_yotp_login": "Yubico OTP-Anmeldung verifiziert"
+        "verified_yotp_login": "Yubico OTP-Anmeldung verifiziert",
+        "xmpp_restarted": "XMPP-Dienst wurde neu gestartet",
+        "xmpp_reloaded": "XMPP-Dienst wurde neu geladen",
+        "xmpp_maps_updated": "XMPP-Maps wurden aktualisiert"
    },
    "tfa": {
        "api_register": "%s verwendet die Yubico Cloud API. Ein API-Key für den Yubico Stick kann <a href=\"https://upgrade.yubico.com/getapikey/\" target=\"_blank\">hier</a> bezogen werden.",
--- a/data/web/lang/lang.en.json
+++ b/data/web/lang/lang.en.json
@@ -26,7 +26,10 @@
        "syncjobs": "Sync jobs",
        "tls_policy": "TLS policy",
        "unlimited_quota": "Unlimited quota for mailboxes",
-        "domain_desc": "Change domain description"
+        "domain_desc": "Change domain description",
+        "xmpp_admin": "Change XMPP admin status of a user",
+        "xmpp_access": "Change XMPP access for a user",
+        "xmpp_prefix": "Change XMPP subdomain"
    },
    "add": {
        "activate_filter_warn": "All other filters will be deactivated, when active is checked.",
@@ -59,6 +62,12 @@
        "full_name": "Full name",
        "gal": "Global Address List",
        "gal_info": "The GAL contains all objects of a domain and cannot be edited by any user. Free/busy information in SOGo is missing, if disabled! <b>Restart SOGo to apply changes.</b>",
+        "xmpp": "Activate XMPP for this domain",
+        "xmpp_info": "This function will enable chat functionality for this domain.",
+        "xmpp_access": "XMPP access",
+        "xmpp_access_info": "XMPP must be enabled for this domain.",
+        "xmpp_admin": "XMPP administrator",
+        "xmpp_admin_info": "<b>Danger:</b> Promotes a user to an XMPP administrator of this domain.",
        "generate": "generate",
        "goto_ham": "Learn as <span class=\"text-success\"><b>ham</b></span>",
        "goto_null": "Silently discard mail",
@@ -353,6 +362,7 @@
        "global_filter_write_error": "Could not write filter file: %s",
        "global_map_invalid": "Global map ID %s invalid",
        "global_map_write_error": "Could not write global map ID %s: %s",
+        "xmpp_map_write_error": "Could not write XMPP map: %s",
        "goto_empty": "An alias address must contain at least one valid goto address",
        "goto_invalid": "Goto address %s is invalid",
        "ham_learn_error": "Ham learn error: %s",
@@ -437,7 +447,9 @@
        "username_invalid": "Username %s cannot be used",
        "validity_missing": "Please assign a period of validity",
        "value_missing": "Please provide all values",
-        "yotp_verification_failed": "Yubico OTP verification failed: %s"
+        "yotp_verification_failed": "Yubico OTP verification failed: %s",
+        "xmpp_restart_failed": "XMPP could not be restarted",
+        "xmpp_reload_failed": "XMPP could not be reloaded"
    },
    "debug": {
        "chart_this_server": "Chart (this server)",
@@ -451,15 +463,18 @@
        "logs": "Logs",
        "restart_container": "Restart",
        "solr_dead": "Solr is starting, disabled or died.",
-        "solr_docs": "Docs",
-        "solr_last_modified": "Last modified",
-        "solr_size": "Size",
-        "solr_started_at": "Started at",
+        "xmpp_dead": "XMPP is starting, disabled or died.",
+        "docs": "Docs",
+        "last_modified": "Last modified",
+        "online_users": "Users online",
+        "size": "Size",
+        "started_at": "Started at",
        "solr_status": "Solr status",
-        "solr_uptime": "Uptime",
+        "uptime": "Uptime",
        "started_on": "Started on",
        "static_logs": "Static logs",
-        "system_containers": "System & Containers"
+        "system_containers": "System & Containers",
+        "xmpp_status": "XMPP status"
    },
    "diagnostics": {
        "cname_from_a": "Value derived from A/AAAA record. This is supported as long as the record points to the correct resource.",
@@ -508,6 +523,14 @@
        "full_name": "Full name",
        "gal": "Global Address List",
        "gal_info": "The GAL contains all objects of a domain and cannot be edited by any user. Free/busy information in SOGo is missing, if disabled! <b>Restart SOGo to apply changes.</b>",
+        "xmpp": "Activate XMPP for this domain",
+        "xmpp_prefix": "XMPP prefix for domain (\"im\" to use <b>im</b>.example.org)",
+        "xmpp_prefix_info": "To request certificates for XMPP, two CNAME DNS records should point from <b>im</b>.example.org as well as <b>*.im</b>.example.org to <b>%s</b>. Please also run the DNS check for this domain after enabling XMPP.",
+        "xmpp_info": "This function will enable chat functionality for this domain.",
+        "xmpp_access": "XMPP access",
+        "xmpp_access_info": "XMPP must be enabled for this domain.",
+        "xmpp_admin": "XMPP administrator",
+        "xmpp_admin_info": "<b>Danger:</b> Promotes a user to an XMPP administrator of this domain.",
        "generate": "generate",
        "grant_types": "Grant types",
        "hostname": "Hostname",
@@ -539,6 +562,7 @@
        "pushover_vars": "When no sender filter is defined, all mails will be considered.<br>Regex filters as well as exact sender checks can be defined individually and will be considered sequentially. They do not depend on each other.<br>Useable variables for text and title (please take note of data protection policies)",
        "pushover_verify": "Verify credentials",
        "quota_mb": "Quota (MiB)",
+        "ratelimit": "Rate limit",
        "redirect_uri": "Redirect/Callback URL",
        "relay_all": "Relay all recipients",
        "relay_all_info": "↪ If you choose <b>not</b> to relay all recipients, you will need to add a (\"blind\") mailbox for every single recipient that should be relayed.",
@@ -561,6 +585,7 @@
        "sogo_visible": "Alias is visible in SOGo",
        "sogo_visible_info": "This option only affects objects, that can be displayed in SOGo (shared or non-shared alias addresses pointing to at least one local mailbox). If hidden, an alias will not appear as selectable sender in SOGo.",
        "spam_alias": "Create or change time limited alias addresses",
+        "spam_filter": "Spam filter",
        "spam_policy": "Add or remove items to white-/blacklist",
        "spam_score": "Set a custom spam score",
        "subfolder2": "Sync into subfolder on destination<br><small>(empty = do not use subfolder)</small>",
@@ -894,7 +919,10 @@
        "verified_totp_login": "Verified TOTP login",
        "verified_u2f_login": "Verified U2F login",
        "verified_fido2_login": "Verified FIDO2 login",
-        "verified_yotp_login": "Verified Yubico OTP login"
+        "verified_yotp_login": "Verified Yubico OTP login",
+        "xmpp_restarted": "XMPP service was restarted",
+        "xmpp_reloaded": "XMPP service was reloaded",
+        "xmpp_maps_updated": "XMPP maps were updated"
    },
    "tfa": {
        "api_register": "%s uses the Yubico Cloud API. Please get an API key for your key <a href=\"https://upgrade.yubico.com/getapikey/\" target=\"_blank\">here</a>",
--- a/data/web/lang/lang.es.json
+++ b/data/web/lang/lang.es.json
@@ -344,12 +344,12 @@
        "logs": "Logs",
        "restart_container": "Reiniciar",
        "solr_dead": "Solr está empezando, deshabilitado o caído.",
-        "solr_docs": "Docs",
-        "solr_last_modified": "Última modificación",
-        "solr_size": "Tamaño",
-        "solr_started_at": "Iniciado el",
+        "docs": "Docs",
+        "last_modified": "Última modificación",
+        "size": "Tamaño",
+        "started_at": "Iniciado el",
        "solr_status": "Solr status",
-        "solr_uptime": "Uptime",
+        "uptime": "Uptime",
        "static_logs": "Logs estáticos",
        "system_containers": "Sistema y Contenedores"
    },
--- a/data/web/lang/lang.fi.json
+++ b/data/web/lang/lang.fi.json
@@ -389,12 +389,12 @@
        "logs": "Logit tausta palveluista",
        "restart_container": "Uudelleen käynnistä",
        "solr_dead": "Solr käynnistyy, on poissa käytöstä tai kuoli.",
-        "solr_docs": "Docs",
-        "solr_last_modified": "Viimeksi muokattu",
-        "solr_size": "Koko",
-        "solr_started_at": "Käynnistetty",
+        "docs": "Docs",
+        "last_modified": "Viimeksi muokattu",
+        "size": "Koko",
+        "started_at": "Käynnistetty",
        "solr_status": "Solr-tila",
-        "solr_uptime": "Päällä",
+        "uptime": "Päällä",
        "started_on": "Aloitettiin",
        "static_logs": "Staattiset lokit",
        "system_containers": "Systeemi & Säiliöt"
--- a/data/web/lang/lang.fr.json
+++ b/data/web/lang/lang.fr.json
@@ -438,12 +438,12 @@
 		"logs": "Logs",
 		"restart_container": "Redémarrer",
 		"solr_dead": "Solr est en cours de démarrage, désactivé ou mort.",
-		"solr_docs": "Docs",
-		"solr_last_modified": "Dernière modification",
-		"solr_size": "Taille",
-		"solr_started_at": "Démarré à",
+		"docs": "Docs",
+		"last_modified": "Dernière modification",
+		"size": "Taille",
+		"started_at": "Démarré à",
 		"solr_status": "Etat Solr",
-		"solr_uptime": "Disponibilité",
+		"uptime": "Disponibilité",
 		"started_on": "Démarré à",
 		"static_logs": "Logs statiques",
 		"system_containers": "Système & Conteneurs"
--- a/data/web/lang/lang.ko.json
+++ b/data/web/lang/lang.ko.json
@@ -438,12 +438,12 @@
        "logs": "Logs",
        "restart_container": "Restart",
        "solr_dead": "Solr is starting, disabled or died.",
-        "solr_docs": "Docs",
-        "solr_last_modified": "Last modified",
-        "solr_size": "Size",
-        "solr_started_at": "Started at",
+        "docs": "Docs",
+        "last_modified": "Last modified",
+        "size": "Size",
+        "started_at": "Started at",
        "solr_status": "Solr status",
-        "solr_uptime": "Uptime",
+        "uptime": "Uptime",
        "started_on": "Started on",
        "static_logs": "Static logs",
        "system_containers": "System & Containers"
--- a/data/web/lang/lang.nl.json
+++ b/data/web/lang/lang.nl.json
@@ -449,12 +449,12 @@
        "logs": "Logs",
        "restart_container": "Herstart",
        "solr_dead": "Solr is uitgeschakeld, uitgevallen of nog bezig met opstarten.",
-        "solr_docs": "Documenten",
-        "solr_last_modified": "Voor het laatst bijgewerkt op",
-        "solr_size": "Grootte",
-        "solr_started_at": "Opgestart op",
+        "docs": "Documenten",
+        "last_modified": "Voor het laatst bijgewerkt op",
+        "size": "Grootte",
+        "started_at": "Opgestart op",
        "solr_status": "Status van Solr",
-        "solr_uptime": "Uptime",
+        "uptime": "Uptime",
        "started_on": "Gestart op",
        "static_logs": "Statische logs",
        "system_containers": "Systeem & containers"
--- a/data/web/lang/lang.ro.json
+++ b/data/web/lang/lang.ro.json
@@ -451,12 +451,12 @@
        "logs": "Jurnale",
        "restart_container": "Repornire",
        "solr_dead": "Solr începe, este invalid sau s-a oprit.",
-        "solr_docs": "Documente",
-        "solr_last_modified": "Ultima modificare",
-        "solr_size": "Mărime",
-        "solr_started_at": "Pornit la",
+        "docs": "Documente",
+        "last_modified": "Ultima modificare",
+        "size": "Mărime",
+        "started_at": "Pornit la",
        "solr_status": "Stare Solr",
-        "solr_uptime": "Timp de funcționare",
+        "uptime": "Timp de funcționare",
        "started_on": "Început pe",
        "static_logs": "Jurnale statice",
        "system_containers": "Sistem și Containere"
--- a/data/web/lang/lang.ru.json
+++ b/data/web/lang/lang.ru.json
@@ -451,12 +451,12 @@
        "logs": "Журналы",
        "restart_container": "Перезапустить",
        "solr_dead": "Solr не запущен. Если вы включили Solf в файле настроек <code>mailcow.conf</code> и это сообщение отображает более получаса, скорее всего Solr сломан.",
-        "solr_docs": "Проиндексировано обьектов",
-        "solr_last_modified": "Последние изменения",
-        "solr_size": "Индексы занимают",
-        "solr_started_at": "Запущен",
+        "docs": "Проиндексировано обьектов",
+        "last_modified": "Последние изменения",
+        "size": "Индексы занимают",
+        "started_at": "Запущен",
        "solr_status": "Состояние Solr",
-        "solr_uptime": "Время работы",
+        "uptime": "Время работы",
        "started_on": "Запущен в",
        "static_logs": "Статические журналы",
        "system_containers": "Система и контейнеры"
--- a/data/web/lang/lang.sk.json
+++ b/data/web/lang/lang.sk.json
@@ -448,12 +448,12 @@
        "logs": "Správy",
        "restart_container": "Reštartovať",
        "solr_dead": "Solr štartuje, bol vypnutý alebo zlyhal.",
-        "solr_docs": "Dokumenty",
-        "solr_last_modified": "Naposledy upravené",
-        "solr_size": "Veľkosť",
-        "solr_started_at": "Spustený",
+        "docs": "Dokumenty",
+        "last_modified": "Naposledy upravené",
+        "size": "Veľkosť",
+        "started_at": "Spustený",
        "solr_status": "Solr status",
-        "solr_uptime": "Doba behu",
+        "uptime": "Doba behu",
        "started_on": "Spustený",
        "static_logs": "Statické správy",
        "system_containers": "Systém & Kontajnery"
--- a/data/web/lang/lang.sv.json
+++ b/data/web/lang/lang.sv.json
@@ -448,12 +448,12 @@
        "logs": "Loggar",
        "restart_container": "Omstart",
        "solr_dead": "Solr är i uppstart, har inaktiveras eller är tillfälligt avstängd.",
-        "solr_docs": "Dokumentation",
-        "solr_last_modified": "Senast ändrad",
-        "solr_size": "Storlek",
-        "solr_started_at": "Startades kl.",
+        "docs": "Dokumentation",
+        "last_modified": "Senast ändrad",
+        "size": "Storlek",
+        "started_at": "Startades kl.",
        "solr_status": "Solr status",
-        "solr_uptime": "Upptid",
+        "uptime": "Upptid",
        "started_on": "Startades",
        "static_logs": "Statiska loggar",
        "system_containers": "System & behållare"
--- a/data/web/lang/lang.zh.json
+++ b/data/web/lang/lang.zh.json
@@ -445,12 +445,12 @@
        "logs": "日志",
        "restart_container": "重启",
        "solr_dead": "Solr在启动中、已关闭或已停止运行",
-        "solr_docs": "文档",
-        "solr_last_modified": "最后修改",
-        "solr_size": "大小",
-        "solr_started_at": "开始于",
+        "docs": "文档",
+        "last_modified": "最后修改",
+        "size": "大小",
+        "started_at": "开始于",
        "solr_status": "Solr状态",
-        "solr_uptime": "运行时间",
+        "uptime": "运行时间",
        "started_on": "启动于",
        "static_logs": "静态日志",
        "system_containers": "系统和容器"