[Cleanup] Clean up the xmpp remainder (#4286)

* [Web] Update russian translation (lang.ru.json)

* XMPP cleanup

Co-authored-by: Dmitriy Alekseev <1865999+dragoangel@users.noreply.github.com>
master
Max 2021-10-18 20:27:38 +02:00 committed by andryyy
parent 1c36f828e0
commit 4a91fdf134
16 changed files with 7 additions and 530 deletions

View File

@ -1,33 +0,0 @@
FROM ejabberd/ecs:21.01
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
ENV GOSU_VERSION 1.11
# We need to copy cert files, dropping rights at a later point
USER root
RUN apk add --update --no-cache su-exec \
bash \
tini \
jq \
mariadb-client \
redis \
tzdata \
curl \
openssl \
bind-tools \
composer \
php7-pdo \
php7-pdo_mysql \
php7-ctype
RUN mkdir -p /var/www/authentication && \
cd /var/www/authentication && \
composer require leesherwood/ejabberd-php-auth monolog/monolog
COPY docker-entrypoint.sh /docker-entrypoint.sh
COPY authenticator /var/www/authentication/authenticator
COPY mailcowCommandExecutor.php /var/www/authentication/vendor/leesherwood/ejabberd-php-auth/src/CommandExecutors/mailcowCommandExecutor.php
ENTRYPOINT ["/docker-entrypoint.sh"]

View File

@ -1,19 +0,0 @@
#!/usr/bin/env php
<?php
require_once __DIR__."/vendor/autoload.php";
use Monolog\Logger;
use LeeSherwood\Ejabberd\AuthenticationService;
use LeeSherwood\Ejabberd\CommandExecutors\mailcowCommandExecutor;
$logger = new Logger('ejabberdAuth');
$stdoutHandler = new Monolog\Handler\StreamHandler('/var/www/authentication/auth.log', Logger::INFO);
$logger->pushHandler($stdoutHandler);
$executor = new mailcowCommandExecutor();
$application = new AuthenticationService($logger, $executor);
$application->run();

View File

@ -1,100 +0,0 @@
#!/bin/bash
set -e
until dig +short mailcow.email > /dev/null; do
echo "Waiting for DNS..."
sleep 1
done
until nc phpfpm 9001 -z; do
echo "Waiting for PHP on port 9001..."
sleep 3
done
until nc phpfpm 9002 -z; do
echo "Waiting for PHP on port 9002..."
sleep 3
done
# Wait for MySQL to warm-up
while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${DBPASS} --silent; do
echo "Waiting for database to come up..."
sleep 2
done
# We dont want to give global write access to ejabberd in this directory
chown -R root:root /var/www/authentication
[ ! -f /sqlite/sqlite.db ] && cp /sqlite/sqlite_template.db /sqlite/sqlite.db
[ ! -d /ejabberd_ssl ] && mkdir /ejabberd_ssl
cp /ssl/cert.pem /ejabberd_ssl/cert.pem
cp /ssl/key.pem /ejabberd_ssl/key.pem
# Write access to upload directory and log file for authenticator
touch /var/www/authentication/auth.log
chown -R ejabberd:ejabberd /var/www/upload \
/var/www/authentication/auth.log \
/sqlite \
/ejabberd_ssl
# ACL file for vhosts, hosts file for vhosts
touch /ejabberd/ejabberd_acl.yml \
/ejabberd/ejabberd_hosts.yml \
/ejabberd/ejabberd_macros.yml
chmod 644 /ejabberd/ejabberd_acl.yml \
/ejabberd/ejabberd_hosts.yml \
/ejabberd/ejabberd_macros.yml
chown 82:82 /ejabberd/ejabberd_acl.yml \
/ejabberd/ejabberd_hosts.yml
chown 82:82 /ejabberd
cat <<EOF > /ejabberd/ejabberd_api.yml
# Autogenerated by mailcow
api_permissions:
"Reload by mailcow":
who:
- ip: "${IPV4_NETWORK}.0/24"
what:
- "reload_config"
- "restart"
- "list_certificates"
- "list_cluster"
- "join_cluster"
- "leave_cluster"
- "backup"
- "status"
- "stats"
- "muc_online_rooms"
EOF
cat <<EOF > /ejabberd/ejabberd_macros.yml
# Autogenerated by mailcow
define_macro:
'MAILCOW_HOSTNAME': "${MAILCOW_HOSTNAME}"
'EJABBERD_HTTPS': ${XMPP_HTTPS_PORT}
EOF
# Set open_basedir
sed -i 's/;open_basedir =/open_basedir = \/var\/www\/authentication/g' /etc/php7/php.ini
sed -i "s/__DBUSER__/${DBUSER}/g" /var/www/authentication/vendor/leesherwood/ejabberd-php-auth/src/CommandExecutors/mailcowCommandExecutor.php
sed -i "s/__DBPASS__/${DBPASS}/g" /var/www/authentication/vendor/leesherwood/ejabberd-php-auth/src/CommandExecutors/mailcowCommandExecutor.php
sed -i "s/__DBNAME__/${DBNAME}/g" /var/www/authentication/vendor/leesherwood/ejabberd-php-auth/src/CommandExecutors/mailcowCommandExecutor.php
# Run hooks
for file in /hooks/*; do
if [ -x "${file}" ]; then
echo "Running hook ${file}"
"${file}"
fi
done
alias ejabberdctl="su-exec ejabberd /home/ejabberd/bin/ejabberdctl --node ejabberd@${MAILCOW_HOSTNAME}"
if [[ -z "$(mysql --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -B -e 'SELECT domain FROM domain WHERE xmpp = 1')" ]]; then
echo "No XMPP host configured, sleeping the sleep of the righteous, waiting for someone to wake me up..."
exec su-exec ejabberd tini -g -- sleep 365d
fi
exec su-exec ejabberd tini -g -- /home/ejabberd/bin/ejabberdctl --node ejabberd@${MAILCOW_HOSTNAME} foreground

View File

@ -1,229 +0,0 @@
<?php namespace LeeSherwood\Ejabberd\CommandExecutors;
/**
* Dummy command executor for ejabberd
*
* This class implements the command executor interface and just returns some sane boolean values.
* You may want to use this class to test your ejabberd external authentication module is set up correctly
* before you start creating your custom code.
*
* @package LeeSherwood\Ejabberd
* @author Lee Sherwood
*/
use \PDO;
class mailcowCommandExecutor implements CommandExecutorInterface {
/**
* Authenticate a user (login)
*
* @param string $username
* @param string $servername
* @param string $password
*
* @return bool
*/
public static function verify_salted_hash($hash, $password, $algo, $salt_length) {
// Decode hash
$dhash = base64_decode($hash);
// Get first n bytes of binary which equals a SSHA hash
$ohash = substr($dhash, 0, $salt_length);
// Remove SSHA hash from decoded hash to get original salt string
$osalt = str_replace($ohash, '', $dhash);
// Check single salted SSHA hash against extracted hash
if (hash_equals(hash($algo, $password . $osalt, true), $ohash)) {
return true;
}
return false;
}
public static function verify_hash($hash, $password) {
if (preg_match('/^{(.+)}(.+)/i', $hash, $hash_array)) {
$scheme = strtoupper($hash_array[1]);
$hash = $hash_array[2];
switch ($scheme) {
case "ARGON2I":
case "ARGON2ID":
case "BLF-CRYPT":
case "CRYPT":
case "DES-CRYPT":
case "MD5-CRYPT":
case "MD5":
case "SHA256-CRYPT":
case "SHA512-CRYPT":
return password_verify($password, $hash);
case "CLEAR":
case "CLEARTEXT":
case "PLAIN":
return $password == $hash;
case "LDAP-MD5":
$hash = base64_decode($hash);
return hash_equals(hash('md5', $password, true), $hash);
case "PBKDF2":
$components = explode('$', $hash);
$salt = $components[2];
$rounds = $components[3];
$hash = $components[4];
return hash_equals(hash_pbkdf2('sha1', $password, $salt, $rounds), $hash);
case "PLAIN-MD4":
return hash_equals(hash('md4', $password), $hash);
case "PLAIN-MD5":
return md5($password) == $hash;
case "PLAIN-TRUNC":
$components = explode('-', $hash);
if (count($components) > 1) {
$trunc_len = $components[0];
$trunc_password = $components[1];
return substr($password, 0, $trunc_len) == $trunc_password;
} else {
return $password == $hash;
}
case "SHA":
case "SHA1":
case "SHA256":
case "SHA512":
// SHA is an alias for SHA1
$scheme = $scheme == "SHA" ? "sha1" : strtolower($scheme);
$hash = base64_decode($hash);
return hash_equals(hash($scheme, $password, true), $hash);
case "SMD5":
return self::verify_salted_hash($hash, $password, 'md5', 16);
case "SSHA":
return self::verify_salted_hash($hash, $password, 'sha1', 20);
case "SSHA256":
return self::verify_salted_hash($hash, $password, 'sha256', 32);
case "SSHA512":
return self::verify_salted_hash($hash, $password, 'sha512', 64);
default:
return false;
}
}
return false;
}
public function authenticate($username, $servername, $password)
{
$database_type = 'mysql';
$database_sock = '/var/run/mysqld/mysqld.sock';
$database_user = '__DBUSER__';
$database_pass = '__DBPASS__';
$database_name = '__DBNAME__';
$dsn = $database_type . ":unix_socket=" . $database_sock . ";dbname=" . $database_name;
$opt = [
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
PDO::ATTR_EMULATE_PREPARES => false
];
try {
$pdo = new PDO($dsn, $database_user, $database_pass, $opt);
}
catch (PDOException $e) {
return false;
}
if (!filter_var($username, FILTER_VALIDATE_EMAIL) && !ctype_alnum(str_replace(array('_', '.', '-'), '', $username))) {
return false;
}
$username = strtolower(trim($username));
$stmt = $pdo->prepare("SELECT `password` FROM `mailbox`
INNER JOIN domain on mailbox.domain = domain.domain
WHERE `kind` NOT REGEXP 'location|thing|group'
AND `mailbox`.`active`= '1'
AND `domain`.`active`= '1'
AND `domain`.`xmpp` = '1'
AND JSON_UNQUOTE(JSON_VALUE(`mailbox`.`attributes`, '$.xmpp_access')) = '1'
AND CONCAT(`domain`.`xmpp_prefix`, '.', `domain`.`domain`) = :servername
AND `username` = CONCAT(:local_part, '@', `domain`.`domain`)");
$stmt->execute(array(':local_part' => $username, ':servername' => $servername));
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
foreach ($rows as $row) {
if (self::verify_hash($row['password'], $password) !== false) {
return true;
}
}
return false;
}
/**
* Check if a user exists
*
* @param string $username
* @param string $servername
*
* @return bool
*/
public function userExists($username, $servername)
{
return true;
}
/**
* Set a password for a user
*
* @param string $username
* @param string $servername
* @param string $password
*
* @return bool
*/
public function setPassword($username, $servername, $password)
{
return false;
}
/**
* Register a user
*
* @param string $username
* @param string $servername
* @param string $password
*
* @return bool
*/
public function register($username, $servername, $password)
{
return false;
}
/**
* Delete a user
*
* @param string $username
* @param string $servername
*
* @return bool
*/
public function removeUser($username, $servername)
{
return false;
}
/**
* Delete a user with password validation
*
* @param string $username
* @param string $servername
* @param string $password
*
* @return bool
*/
public function removeUserWithPassword($username, $servername, $password)
{
return false;
}
}

View File

@ -186,9 +186,6 @@ chown -R 82:82 /web/templates/cache
# Clear cache # Clear cache
find /web/templates/cache/* -not -name '.gitkeep' -delete find /web/templates/cache/* -not -name '.gitkeep' -delete
[[ ! -f /etc/nginx/conf.d/ZZZ-ejabberd.conf ]] && echo '# Autogenerated by mailcow' > /etc/nginx/conf.d/ZZZ-ejabberd.conf
chown 82:82 /etc/nginx/conf.d/ZZZ-ejabberd.conf
# Run hooks # Run hooks
for file in /hooks/*; do for file in /hooks/*; do
if [ -x "${file}" ]; then if [ -x "${file}" ]; then

View File

@ -26,10 +26,6 @@
"tls_policy": "TLS politik", "tls_policy": "TLS politik",
"unlimited_quota": "Ubegrænset quote for mailbokse", "unlimited_quota": "Ubegrænset quote for mailbokse",
"domain_desc": "Skift domæne beskrivelse", "domain_desc": "Skift domæne beskrivelse",
"xmpp_admin": "Promover XMPP-bruger til administrator",
"xmpp_domain_access": "Konfigurer XMPP-domæneadgang",
"xmpp_mailbox_access": "Konfigurer XMPP-brugeradgang",
"xmpp_prefix": "Skift XMPP-underdomæne (præfiks)"
}, },
"add": { "add": {
"activate_filter_warn": "Alle andre filtre deaktiveres, når aktiv er markeret.", "activate_filter_warn": "Alle andre filtre deaktiveres, når aktiv er markeret.",

View File

@ -29,10 +29,6 @@
"syncjobs": "Sync Jobs", "syncjobs": "Sync Jobs",
"tls_policy": "Verschlüsselungsrichtlinie", "tls_policy": "Verschlüsselungsrichtlinie",
"unlimited_quota": "Unendliche Quota für Mailboxen", "unlimited_quota": "Unendliche Quota für Mailboxen",
"xmpp_admin": "Benutzer zum XMPP-Administrator ernennen",
"xmpp_domain_access": "XMPP-Zugang einer Domain konfigurieren",
"xmpp_mailbox_access": "XMPP-Zugang eines Benutzers einstellen",
"xmpp_prefix": "XMPP-Subdomain/Präfix ändern"
}, },
"add": { "add": {
"activate_filter_warn": "Alle anderen Filter dieses Typs werden deaktiviert, falls dieses Script aktiv markiert wird.", "activate_filter_warn": "Alle anderen Filter dieses Typs werden deaktiviert, falls dieses Script aktiv markiert wird.",
@ -110,14 +106,6 @@
"username": "Benutzername", "username": "Benutzername",
"validate": "Validieren", "validate": "Validieren",
"validation_success": "Erfolgreich validiert", "validation_success": "Erfolgreich validiert",
"xmpp": "XMPP für diese Domain aktivieren",
"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.",
"xmpp_info": "Diese Funktion stellt eine Chat-Funktionalität für die Domain bereit.",
"xmpp_prefix": "XMPP-Präfix 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."
}, },
"admin": { "admin": {
"access": "Zugang", "access": "Zugang",
@ -469,9 +457,6 @@
"username_invalid": "Benutzername %s kann nicht verwendet werden", "username_invalid": "Benutzername %s kann nicht verwendet werden",
"validity_missing": "Bitte geben Sie eine Gültigkeitsdauer an", "validity_missing": "Bitte geben Sie eine Gültigkeitsdauer an",
"value_missing": "Bitte alle Felder ausfüllen", "value_missing": "Bitte alle Felder ausfüllen",
"xmpp_map_write_error": "Kann XMPP-Map nicht schreiben: %s",
"xmpp_reload_failed": "XMPP konnte nicht neu geladen werden",
"xmpp_restart_failed": "XMPP konnte nicht neu gestartet werden",
"yotp_verification_failed": "Yubico OTP-Verifizierung fehlgeschlagen: %s" "yotp_verification_failed": "Yubico OTP-Verifizierung fehlgeschlagen: %s"
}, },
"debug": { "debug": {
@ -500,8 +485,6 @@
"system_containers": "System & Container", "system_containers": "System & Container",
"uptime": "Uptime", "uptime": "Uptime",
"username": "Benutzername", "username": "Benutzername",
"xmpp_dead": "XMPP startet, ist deaktiviert oder temporär nicht erreichbar.",
"xmpp_status": "XMPP Status"
}, },
"diagnostics": { "diagnostics": {
"cname_from_a": "Wert abgeleitet von A/AAAA-Eintrag. Wird unterstützt, sofern der Eintrag auf die korrekte Ressource zeigt.", "cname_from_a": "Wert abgeleitet von A/AAAA-Eintrag. Wird unterstützt, sofern der Eintrag auf die korrekte Ressource zeigt.",
@ -625,15 +608,6 @@
"unchanged_if_empty": "Unverändert, wenn leer", "unchanged_if_empty": "Unverändert, wenn leer",
"username": "Benutzername", "username": "Benutzername",
"validate_save": "Validieren und speichern", "validate_save": "Validieren und speichern",
"xmpp": "XMPP für diese Domain aktivieren",
"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.",
"xmpp_example_jid": "<b>Beispiel JID</b> (Passwort entspricht Mailbox-Passwort)",
"xmpp_info": "Diese Funktion stellt eine Chat-Funktionalität für die Domain bereit.",
"xmpp_prefix": "XMPP-Präfix 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."
}, },
"fido2": { "fido2": {
"confirm": "Bestätigen", "confirm": "Bestätigen",
@ -976,9 +950,6 @@
"verified_totp_login": "TOTP-Anmeldung verifiziert", "verified_totp_login": "TOTP-Anmeldung verifiziert",
"verified_u2f_login": "U2F-Anmeldung verifiziert", "verified_u2f_login": "U2F-Anmeldung verifiziert",
"verified_yotp_login": "Yubico-OTP-Anmeldung verifiziert", "verified_yotp_login": "Yubico-OTP-Anmeldung verifiziert",
"xmpp_maps_updated": "XMPP-Maps wurden aktualisiert",
"xmpp_reloaded": "XMPP-Dienst wurde neu geladen",
"xmpp_restarted": "XMPP-Dienst wurde neu gestartet"
}, },
"tfa": { "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.", "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.",

View File

@ -29,10 +29,6 @@
"syncjobs": "Sync jobs", "syncjobs": "Sync jobs",
"tls_policy": "TLS policy", "tls_policy": "TLS policy",
"unlimited_quota": "Unlimited quota for mailboxes", "unlimited_quota": "Unlimited quota for mailboxes",
"xmpp_admin": "Promote XMPP user to administrator",
"xmpp_domain_access": "Configure XMPP domain access",
"xmpp_mailbox_access": "Configure XMPP user access",
"xmpp_prefix": "Change XMPP subdomain (prefix)"
}, },
"add": { "add": {
"activate_filter_warn": "All other filters will be deactivated, when active is checked.", "activate_filter_warn": "All other filters will be deactivated, when active is checked.",
@ -110,12 +106,6 @@
"username": "Username", "username": "Username",
"validate": "Validate", "validate": "Validate",
"validation_success": "Validated successfully", "validation_success": "Validated successfully",
"xmpp": "Activate XMPP 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.",
"xmpp_info": "This function will enable chat functionality for this domain."
}, },
"admin": { "admin": {
"access": "Access", "access": "Access",
@ -471,9 +461,6 @@
"username_invalid": "Username %s cannot be used", "username_invalid": "Username %s cannot be used",
"validity_missing": "Please assign a period of validity", "validity_missing": "Please assign a period of validity",
"value_missing": "Please provide all values", "value_missing": "Please provide all values",
"xmpp_map_write_error": "Could not write XMPP map: %s",
"xmpp_reload_failed": "XMPP could not be reloaded",
"xmpp_restart_failed": "XMPP could not be restarted",
"yotp_verification_failed": "Yubico OTP verification failed: %s" "yotp_verification_failed": "Yubico OTP verification failed: %s"
}, },
"debug": { "debug": {

View File

@ -27,10 +27,6 @@
"tls_policy": "Police TLS", "tls_policy": "Police TLS",
"unlimited_quota": "Quota illimité pour les boites de courriel", "unlimited_quota": "Quota illimité pour les boites de courriel",
"domain_desc": "Modifier la description du domaine", "domain_desc": "Modifier la description du domaine",
"xmpp_admin": "Promouvoir l'utilisateur XMPP en administrateur",
"xmpp_domain_access": "Configurer l'accès au domaine XMPP",
"xmpp_mailbox_access": "Configurer l'accès à l'utilisateur XMPP",
"xmpp_prefix": "Changer le sous-domaine XMPP (préfixe)"
}, },
"add": { "add": {
"activate_filter_warn": "Tous les autres filtres seront désactivés, quand activé est coché.", "activate_filter_warn": "Tous les autres filtres seront désactivés, quand activé est coché.",
@ -63,12 +59,6 @@
"full_name": "Nom complet", "full_name": "Nom complet",
"gal": "Carnet d'Adresses Global (GAL)", "gal": "Carnet d'Adresses Global (GAL)",
"gal_info": "La liste d'adresse globale (GAL) contient tous les objets d'un domaine et ne peut être modifié par aucun utilisateur. Si elles sont désactivées,les informations libres/occupées dans SOGo sont cachées, ! <b>Redémarrez SOGo pour appliquer les changements.</b>", "gal_info": "La liste d'adresse globale (GAL) contient tous les objets d'un domaine et ne peut être modifié par aucun utilisateur. Si elles sont désactivées,les informations libres/occupées dans SOGo sont cachées, ! <b>Redémarrez SOGo pour appliquer les changements.</b>",
"xmpp": "Activer XMPP pour ce domaine",
"xmpp_info": "Cette fonction activera la fonctionnalité de chat pour ce domaine.",
"xmpp_access": "Accès XMPP",
"xmpp_access_info": "XMPP doit être activé pour ce domaine.",
"xmpp_admin": "Administrateur XMPP",
"xmpp_admin_info": "<b>Attention</b>: promeut un utilisateur au rang d'administrateur XMPP pour ce domaine.",
"generate": "Générer", "generate": "Générer",
"goto_ham": "Apprendre en tant que <span class=\"text-success\"><b>Courrier légitime (ham)</b></span>", "goto_ham": "Apprendre en tant que <span class=\"text-success\"><b>Courrier légitime (ham)</b></span>",
"goto_null": "Ignorer silencieusement le courriel", "goto_null": "Ignorer silencieusement le courriel",
@ -363,7 +353,6 @@
"global_filter_write_error": "Impossible décrire le fichier de filtre: %s", "global_filter_write_error": "Impossible décrire le fichier de filtre: %s",
"global_map_invalid": "ID de carte globale %s non valide", "global_map_invalid": "ID de carte globale %s non valide",
"global_map_write_error": "Impossible décrire lID de la carte globale %s: %s", "global_map_write_error": "Impossible décrire lID de la carte globale %s: %s",
"xmpp_map_write_error": "Impossible d'écrire la carte XMPP: %s",
"goto_empty": "Une adresse alias doit contenir au moins une adresse 'goto'valide", "goto_empty": "Une adresse alias doit contenir au moins une adresse 'goto'valide",
"goto_invalid": "Adresse Goto %s non valide", "goto_invalid": "Adresse Goto %s non valide",
"ham_learn_error": "Erreur d'apprentissage Ham: %s", "ham_learn_error": "Erreur d'apprentissage Ham: %s",
@ -450,8 +439,6 @@
"validity_missing": "Veuillez attribuer une période de validité", "validity_missing": "Veuillez attribuer une période de validité",
"value_missing": "Veuillez fournir toutes les valeurs", "value_missing": "Veuillez fournir toutes les valeurs",
"yotp_verification_failed": "La vérification Yubico OTP a échoué: %s", "yotp_verification_failed": "La vérification Yubico OTP a échoué: %s",
"xmpp_restart_failed": "XMPP n'a pas pu être redémarré",
"xmpp_reload_failed": "XMPP n'a pas pu être rechargé"
}, },
"debug": { "debug": {
"chart_this_server": "Graphique (ce serveur)", "chart_this_server": "Graphique (ce serveur)",
@ -465,7 +452,6 @@
"logs": "Logs", "logs": "Logs",
"restart_container": "Redémarrer", "restart_container": "Redémarrer",
"solr_dead": "Solr est en cours de démarrage, désactivé ou mort.", "solr_dead": "Solr est en cours de démarrage, désactivé ou mort.",
"xmpp_dead": "XMPP est en cours de démarrage, désactivé ou mort.",
"docs": "Docs", "docs": "Docs",
"last_modified": "Dernière modification", "last_modified": "Dernière modification",
"online_users": "Utilisateurs en ligne", "online_users": "Utilisateurs en ligne",
@ -476,7 +462,6 @@
"started_on": "Démarré à", "started_on": "Démarré à",
"static_logs": "Logs statiques", "static_logs": "Logs statiques",
"system_containers": "Système & Conteneurs", "system_containers": "Système & Conteneurs",
"xmpp_status": "Status de XMPP"
}, },
"diagnostics": { "diagnostics": {
"cname_from_a": "Valeur dérivée de lenregistrement A/AAAA. Ceci est supporté tant que lenregistrement indique la bonne ressource.", "cname_from_a": "Valeur dérivée de lenregistrement A/AAAA. Ceci est supporté tant que lenregistrement indique la bonne ressource.",
@ -525,15 +510,6 @@
"full_name": "Nom complet", "full_name": "Nom complet",
"gal": "Liste d'adresses globale (GAL)", "gal": "Liste d'adresses globale (GAL)",
"gal_info": "La liste d'adresses globale (GAL) contient tous les objets dun domaine et ne peut pas être édité par un utilisateur. Les informations libres/occupées dans SOGo sont manquantes si elles sont désactivées! <b>Redémarrer SOGo pour appliquer les modifications.</b>", "gal_info": "La liste d'adresses globale (GAL) contient tous les objets dun domaine et ne peut pas être édité par un utilisateur. Les informations libres/occupées dans SOGo sont manquantes si elles sont désactivées! <b>Redémarrer SOGo pour appliquer les modifications.</b>",
"xmpp": "Activer XMPP pour ce domaine",
"xmpp_prefix": "Préfixe XMPP pour le domaine (\"im\" pour utiliser <b>im</b>.exemple.org)",
"xmpp_prefix_info": "Pour demander des certificats XMPP, deux enregistrements DNS CNAME doivent pointer de <b> im </b> .exemple.org ainsi que de <b> * .im </b> .exemple.org vers <b>% s </ b>. Veuillez également exécuter la vérification DNS pour ce domaine après avoir activé XMPP.",
"xmpp_info": "Cette fonction activera la fonctionnalité de chat pour ce domaine.",
"xmpp_access": "Accès XMPP",
"xmpp_access_info": "XMPP doit être activé pour ce domaine.",
"xmpp_admin": "Administrateur XMPP",
"xmpp_admin_info": "<b>Attention:</b> Promeut un utilisateur au rang d'administrateur XMPP de ce domaine.",
"xmpp_example_jid": "<b>Exemple JID</b> (se connecter avec le mot de passe de la boîte aux lettres)",
"generate": "générer", "generate": "générer",
"grant_types": "Types 'autorisation", "grant_types": "Types 'autorisation",
"hostname": "Nom d'hôte", "hostname": "Nom d'hôte",
@ -924,9 +900,6 @@
"verified_u2f_login": "Authentification U2F vérifiée", "verified_u2f_login": "Authentification U2F vérifiée",
"verified_fido2_login": "Authentification FIDO2 vérifiée", "verified_fido2_login": "Authentification FIDO2 vérifiée",
"verified_yotp_login": "Authentification Yubico OTP vérifiée", "verified_yotp_login": "Authentification Yubico OTP vérifiée",
"xmpp_restarted": "Le service XMPP a été redémarré",
"xmpp_reloaded": "Le service XMPP a été rechargé",
"xmpp_maps_updated": "Les cartes XMPP ont été mises à jour"
}, },
"tfa": { "tfa": {
"api_register": "%s utilise l'API Yubico Cloud. Veuillez obtenir une clé API pour votre clé <a href=\"https://upgrade.yubico.com/getapikey/\" target=\"_blank\">here</a>", "api_register": "%s utilise l'API Yubico Cloud. Veuillez obtenir une clé API pour votre clé <a href=\"https://upgrade.yubico.com/getapikey/\" target=\"_blank\">here</a>",

View File

@ -29,10 +29,6 @@
"syncjobs": "Processi di sync", "syncjobs": "Processi di sync",
"tls_policy": "TLS policy", "tls_policy": "TLS policy",
"unlimited_quota": "Spazio illimitato per le caselle di posta", "unlimited_quota": "Spazio illimitato per le caselle di posta",
"xmpp_admin": "Promuovi l'utente XMPP ad amministratore",
"xmpp_domain_access": "Configura l'accesso al dominio XMPP",
"xmpp_mailbox_access": "Configura l'accesso utente XMPP",
"xmpp_prefix": "Cambia sottodominio XMPP (prefisso)"
}, },
"add": { "add": {
"activate_filter_warn": "Tutti gli altri filtri saranno disattivati, quando è attivo.", "activate_filter_warn": "Tutti gli altri filtri saranno disattivati, quando è attivo.",
@ -109,12 +105,6 @@
"username": "Username", "username": "Username",
"validate": "Convalida", "validate": "Convalida",
"validation_success": "Convalidato con successo", "validation_success": "Convalidato con successo",
"xmpp": "Attiva XMPP per questo dominio",
"xmpp_access": "Accesso XMPP",
"xmpp_access_info": "XMPP deve essere abilitato per questo dominio.",
"xmpp_admin": "Amministratore XMPP",
"xmpp_admin_info": "<b>Attenzione:</b> Promuove un utente ad amministratore XMPP di questo dominio.",
"xmpp_info": "Questa funzione abiliterà la funzionalità di chat per questo dominio."
}, },
"admin": { "admin": {
"access": "Accedi", "access": "Accedi",

View File

@ -27,10 +27,6 @@
"tls_policy": "Versleutelingsbeleid", "tls_policy": "Versleutelingsbeleid",
"unlimited_quota": "Onbeperkte quota voor mailboxen", "unlimited_quota": "Onbeperkte quota voor mailboxen",
"domain_desc": "Wijzig domeinbeschrijving", "domain_desc": "Wijzig domeinbeschrijving",
"xmpp_admin": "Promoveer XMPP-gebruiker tot administrator",
"xmpp_domain_access": "Configureer XMPP-domeintoegang",
"xmpp_mailbox_access": "Configureer XMPP-gebruikerstoegang",
"xmpp_prefix": "Wijzig XMPP subdomein (prefix)"
}, },
"add": { "add": {
"activate_filter_warn": "Alle andere filters worden gedeactiveerd zolang deze geactiveerd is.", "activate_filter_warn": "Alle andere filters worden gedeactiveerd zolang deze geactiveerd is.",
@ -63,12 +59,6 @@
"full_name": "Volledige naam", "full_name": "Volledige naam",
"gal": "Globale adreslijst", "gal": "Globale adreslijst",
"gal_info": "De globale adreslijst bevat alle objecten van een domein. Deze kunnen door geen enkele gebruiker worden bewerkt. <b>Herstart SOGo om wijzigingen door te voeren.</b>", "gal_info": "De globale adreslijst bevat alle objecten van een domein. Deze kunnen door geen enkele gebruiker worden bewerkt. <b>Herstart SOGo om wijzigingen door te voeren.</b>",
"xmpp": "Activeer XMPP voor dit domein",
"xmpp_info": "Deze optie activeert de chatfunctionaliteit voor dit domein.",
"xmpp_access": "XMPP-toegang",
"xmpp_access_info": "XMPP dient ingeschakeld te zijn voor dit domein.",
"xmpp_admin": "XMPP-administrator",
"xmpp_admin_info": "<b>Waarschuwing:</b> Promoveert een gebruiker tot XMPP-administrator van dit domein.",
"generate": "genereer", "generate": "genereer",
"goto_ham": "Train als <span class=\"text-success\"><b>ham</b></span>", "goto_ham": "Train als <span class=\"text-success\"><b>ham</b></span>",
"goto_null": "Verwijder mail onmiddelijk", "goto_null": "Verwijder mail onmiddelijk",

View File

@ -29,10 +29,6 @@
"syncjobs": "Lucrări de sincronizare", "syncjobs": "Lucrări de sincronizare",
"tls_policy": "Politică TLS", "tls_policy": "Politică TLS",
"unlimited_quota": "Cota nelimitată pentru cutiile poștale", "unlimited_quota": "Cota nelimitată pentru cutiile poștale",
"xmpp_admin": "Promovează utilizatorul XMPP ca administrator",
"xmpp_domain_access": "Configurează accesul domeniului la XMPP",
"xmpp_mailbox_access": "Configurează accesul utilizatorului la XMPP",
"xmpp_prefix": "Schimbă subdomeniul (prefixul) pentru XMPP"
}, },
"add": { "add": {
"activate_filter_warn": "Toate celelalte filtre vor fi dezactivate, când este bifată opțiunea activă.", "activate_filter_warn": "Toate celelalte filtre vor fi dezactivate, când este bifată opțiunea activă.",
@ -65,12 +61,6 @@
"full_name": "Nume complet", "full_name": "Nume complet",
"gal": "Lista adreselor globale", "gal": "Lista adreselor globale",
"gal_info": "GAL conține toate obiectele unui domeniu și nu poate fi editat de niciun utilizator. Informația liber/ocupat din SOGo lipsește dacă este dezactivat! <b>Reporniți SOGo pentru a aplica modificările.</b>", "gal_info": "GAL conține toate obiectele unui domeniu și nu poate fi editat de niciun utilizator. Informația liber/ocupat din SOGo lipsește dacă este dezactivat! <b>Reporniți SOGo pentru a aplica modificările.</b>",
"xmpp": "Activează XMPP pentru acest domeniu",
"xmpp_info": "Această funcție va activa mesageria pentru acest domeniu.",
"xmpp_access": "Acces XMPP",
"xmpp_access_info": "XMPP trebuie să fie activ pentru acest domeniu.",
"xmpp_admin": "Administrator XMPP",
"xmpp_admin_info": "<b>Atenție:</b> Promovează un utilizator ca administrator XMPP pentru acest domeniu.",
"generate": "generează", "generate": "generează",
"goto_ham": "Învață ca <span class=\"text-success\"><b>ham</b></span>", "goto_ham": "Învață ca <span class=\"text-success\"><b>ham</b></span>",
"goto_null": "Aruncă emailul în mod silențios", "goto_null": "Aruncă emailul în mod silențios",

View File

@ -29,10 +29,6 @@
"syncjobs": "Задания синхронизации", "syncjobs": "Задания синхронизации",
"tls_policy": "Политика шифрования", "tls_policy": "Политика шифрования",
"unlimited_quota": "Неограниченная квота для почтовых ящиков", "unlimited_quota": "Неограниченная квота для почтовых ящиков",
"xmpp_admin": "Повышение пользователя XMPP до администратора",
"xmpp_domain_access": "Настройка доступа XMPP для домена",
"xmpp_mailbox_access": "Настройка доступа XMPP для пользователей",
"xmpp_prefix": "Измение субдомена (префикса) XMPP"
}, },
"add": { "add": {
"activate_filter_warn": "Активация этого фильтра отключит все остальные фильтры этого типа.", "activate_filter_warn": "Активация этого фильтра отключит все остальные фильтры этого типа.",
@ -110,12 +106,6 @@
"username": "Имя пользователя", "username": "Имя пользователя",
"validate": "Проверить", "validate": "Проверить",
"validation_success": "Проверка прошла успешно", "validation_success": "Проверка прошла успешно",
"xmpp": "Активировать XMPP для этого домена",
"xmpp_access": "Пользователь XMPP",
"xmpp_access_info": "XMPP должен быть включен для этого домена.",
"xmpp_admin": "Администратор XMPP",
"xmpp_admin_info": "Повысить пользователя XMPP до <span class=\"text-danger\">администратора домена</span>.",
"xmpp_info": "Эта опция добавит функциональность чата для этого домена."
}, },
"admin": { "admin": {
"access": "Настройки доступа", "access": "Настройки доступа",

View File

@ -29,10 +29,6 @@
"syncjobs": "Synchronizačné úlohy", "syncjobs": "Synchronizačné úlohy",
"tls_policy": "TLS pravidlá", "tls_policy": "TLS pravidlá",
"unlimited_quota": "Neobmedzená kvóta pre poštové schránky", "unlimited_quota": "Neobmedzená kvóta pre poštové schránky",
"xmpp_admin": "Povýšiť XMPP používateľa na správcu",
"xmpp_domain_access": "Nakonfigurovať prístup k XMPP doméne.",
"xmpp_mailbox_access": "Nakonfigurovať používateľovi XMPP prístup.",
"xmpp_prefix": "Zmeniť XMPP subdoménu (prefix)"
}, },
"add": { "add": {
"activate_filter_warn": "Všetky ostatné filtre budú deaktivované, ak bude zaškrtnuté pole \"Aktívny\".", "activate_filter_warn": "Všetky ostatné filtre budú deaktivované, ak bude zaškrtnuté pole \"Aktívny\".",
@ -110,12 +106,6 @@
"username": "Používateľské meno", "username": "Používateľské meno",
"validate": "Overiť", "validate": "Overiť",
"validation_success": "Úspešne overené", "validation_success": "Úspešne overené",
"xmpp": "Aktivovať XMPP pre túto doménu",
"xmpp_access": "XMPP prístup",
"xmpp_access_info": "XMPP musí byť aktivované pre túto doménu.",
"xmpp_admin": "XMPP administrátor",
"xmpp_admin_info": "<b>Upozornenie:</b> Povýši užívateľa na XMPP administrátora pre túto doménu.",
"xmpp_info": "Aktivovanie tejto funkcie umožní četovanie v tejto doméne."
}, },
"admin": { "admin": {
"access": "Prístup", "access": "Prístup",

View File

@ -27,10 +27,6 @@
"tls_policy": "Krypteringspolicy", "tls_policy": "Krypteringspolicy",
"unlimited_quota": "Obegränsad kvot för postlådor", "unlimited_quota": "Obegränsad kvot för postlådor",
"domain_desc": "Ändra domänbeskrivningen", "domain_desc": "Ändra domänbeskrivningen",
"xmpp_admin": "Ändra XMPP administratörs-status på en användare",
"xmpp_domain_access": "Ändra XMPP-åtkomsten på en domän",
"xmpp_mailbox_access": "Ändra XMPP-åtkomsten på en användare",
"xmpp_prefix": "Ändra XMPP-subdomän/prefix"
}, },
"add": { "add": {
"activate_filter_warn": "Alla andra filter av den här typen kommer inaktiveras om det här skriptet markeras som aktivt.", "activate_filter_warn": "Alla andra filter av den här typen kommer inaktiveras om det här skriptet markeras som aktivt.",
@ -63,14 +59,6 @@
"full_name": "Fullständiga namn", "full_name": "Fullständiga namn",
"gal": "Global adressbok", "gal": "Global adressbok",
"gal_info": "Den global adressboken innehåller alla objekt i en domän och kan inte redigeras av någon användare. Informationen om tillgänglighet i SOGo är endast synlig när den globala adressboken är påslagen. <b>Starta om SOGo för att tillämpa ändringar.</b>", "gal_info": "Den global adressboken innehåller alla objekt i en domän och kan inte redigeras av någon användare. Informationen om tillgänglighet i SOGo är endast synlig när den globala adressboken är påslagen. <b>Starta om SOGo för att tillämpa ändringar.</b>",
"xmpp": "Aktivera XMPP funktion på denna domän",
"xmpp_prefix": "XMPP-prefix för domänen (Exempelvis \"im\" för <b>im</b>.example.org)",
"xmpp_prefix_info": "För att tillhandahålla ett säkerhetscertifikat måste vissa DNS-uppslag skapas, exempelvis två CNAME uppslag, ett för <b>im</b>.example.org och ett för <b>*.im</b>.example.org, som pekar mot <b>%s</b>. Efter att denna funktion har aktiverats, utför en DNS-kontroll för att testa att uppslagen är korrekt uppsatta.",
"xmpp_info": "Denna funktion aktiverar chatt-funktionalitet på denna domän.",
"xmpp_access": "XMPP-åtkomst",
"xmpp_access_info": "XMPP måste aktiveras på den här domänen.",
"xmpp_admin": "XMPP Administratör",
"xmpp_admin_info": "<b>Varning:</b> Befodrar en användare till XMPP-administratör på den här domänen.",
"generate": "generera", "generate": "generera",
"goto_ham": "Markera detta som en <span class=\"text-success\"><b>felaktig spam-registrering</b>, detta kommer förhindra liknande fel i framtiden</span>", "goto_ham": "Markera detta som en <span class=\"text-success\"><b>felaktig spam-registrering</b>, detta kommer förhindra liknande fel i framtiden</span>",
"goto_null": "Kasta e-postmeddelanande omedelbart", "goto_null": "Kasta e-postmeddelanande omedelbart",

View File

@ -42,7 +42,3 @@ services:
dockerapi-mailcow: dockerapi-mailcow:
dns: dns:
- my.resolvers.ip.addr - my.resolvers.ip.addr
ejabberd-mailcow:
dns:
- my.resolvers.ip.addr