From 5dca4dac81260d92ce62f4b6c825a8c630e6c65e Mon Sep 17 00:00:00 2001 From: milkmaker Date: Sat, 4 Feb 2023 15:00:07 +0100 Subject: [PATCH 01/12] [Web] Updated lang.ru-ru.json (#5046) Co-authored-by: Aleksandr Kliushenok --- data/web/lang/lang.ru-ru.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/web/lang/lang.ru-ru.json b/data/web/lang/lang.ru-ru.json index 60aba927..017ffd02 100644 --- a/data/web/lang/lang.ru-ru.json +++ b/data/web/lang/lang.ru-ru.json @@ -37,7 +37,7 @@ "add_domain_only": "Только добавить домен", "add_domain_restart": "Добавить домен и перезапустить SOGo", "alias_address": "Псевдоним/ы", - "alias_address_info": "Укажите почтовые адреса разделенные запятыми или, если хотите пересылать все сообщения для домена владельцам псевдонима то: @example.com. Только домены mailcow разрешены.", + "alias_address_info": "Адрес(а) электронной почты (через запятую) или @example.com (для перехвата всех писем для домена). только домены mailcow.", "alias_domain": "Псевдоним домена", "alias_domain_info": "Действительные имена доменов, раздёленные запятыми.", "app_name": "Название приложения", @@ -335,7 +335,8 @@ "username": "Имя пользователя", "validate_license_now": "Получить лицензию на основе GUID с сервера лицензий", "verify": "Проверить", - "yes": "✓" + "yes": "✓", + "queue_unban": "разблокировать" }, "danger": { "access_denied": "Доступ запрещён, или указаны неверные данные", From dc85f4996192210cdd1ab3b2a43bccca59e7e52a Mon Sep 17 00:00:00 2001 From: Tomy Hsieh Date: Sat, 11 Feb 2023 21:49:21 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E2=9C=A8=20feat:=20Change=20FIDO2=20logi?= =?UTF-8?q?n=20to=20independent=20button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/web/templates/index.twig | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/data/web/templates/index.twig b/data/web/templates/index.twig index e90a720a..45054b5f 100644 --- a/data/web/templates/index.twig +++ b/data/web/templates/index.twig @@ -38,15 +38,8 @@
-
-
- - - -
-
+ + {% if not oauth2_request %}
'; } - item.in_use = '
' + + item.in_use = { + sortBy: item.percent_in_use, + value: '
' + '
' + item.percent_in_use + '%' + '
'; + 'style="min-width:2em;width:' + item.percent_in_use + '%">' + item.percent_in_use + '%' + '
' + }; item.username = escapeHtml(item.username); if (Array.isArray(item.tags)){ @@ -994,10 +997,11 @@ jQuery(function($){ }, { title: lang.in_use, - data: 'in_use', + data: 'in_use.value', defaultContent: '', responsivePriority: 9, - className: 'dt-data-w100' + className: 'dt-data-w100', + orderData: 24 }, { title: lang.fname, @@ -1102,7 +1106,12 @@ jQuery(function($){ { title: "", data: 'quota.sortBy', - responsivePriority: 8, + defaultContent: '', + className: "d-none" + }, + { + title: "", + data: 'in_use.sortBy', defaultContent: '', className: "d-none" }, From 7f0dd7d0d7a52115c3b97bb8c634b4b67d0693bb Mon Sep 17 00:00:00 2001 From: Niklas Meyer Date: Fri, 17 Feb 2023 12:53:31 +0100 Subject: [PATCH 10/12] [Nextcloud] Added bzip2 as required package --- helper-scripts/nextcloud.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/helper-scripts/nextcloud.sh b/helper-scripts/nextcloud.sh index 31cdb6a4..50fcbab3 100755 --- a/helper-scripts/nextcloud.sh +++ b/helper-scripts/nextcloud.sh @@ -2,9 +2,12 @@ # renovate: datasource=github-releases depName=nextcloud/server versioning=semver extractVersion=^v(?.*)$ NEXTCLOUD_VERSION=25.0.3 -for bin in curl dirmngr; do - if [[ -z $(which ${bin}) ]]; then echo "Cannot find ${bin}, exiting..."; exit 1; fi +echo -ne "Checking prerequisites..." +sleep 1 +for bin in curl dirmngr tar bzip2; do + if [[ -z $(which ${bin}) ]]; then echo -ne "\r\033[31mCannot find ${bin}, exiting...\033[0m\n"; exit 1; fi done +echo -ne "\r\033[32mFound all prerequisites! Continuing...\033[0m\n" [[ -z ${1} ]] && NC_HELP=y @@ -215,5 +218,4 @@ elif [[ ${NC_RESETPW} == "y" ]]; then read -p "Enter the username: " NC_USER done docker exec -it -u www-data $(docker ps -f name=php-fpm-mailcow -q) /web/nextcloud/occ user:resetpassword ${NC_USER} - fi From 04403aaf70b106bdffa19614b1ce25f715d4d7c0 Mon Sep 17 00:00:00 2001 From: FreddleSpl0it Date: Fri, 17 Feb 2023 13:15:44 +0100 Subject: [PATCH 11/12] [Netfilter] fix setting SNAT Rule if chain is empty --- data/Dockerfiles/netfilter/server.py | 37 +++++++++++++++++----------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/data/Dockerfiles/netfilter/server.py b/data/Dockerfiles/netfilter/server.py index 1ccc150e..0b0e2a41 100644 --- a/data/Dockerfiles/netfilter/server.py +++ b/data/Dockerfiles/netfilter/server.py @@ -359,21 +359,28 @@ def snat4(snat_target): chain = iptc.Chain(table, 'POSTROUTING') table.autocommit = False new_rule = get_snat4_rule() - for position, rule in enumerate(chain.rules): - match = all(( - new_rule.get_src() == rule.get_src(), - new_rule.get_dst() == rule.get_dst(), - new_rule.target.parameters == rule.target.parameters, - new_rule.target.name == rule.target.name - )) - if position == 0: - if not match: - logInfo(f'Added POSTROUTING rule for source network {new_rule.src} to SNAT target {snat_target}') - chain.insert_rule(new_rule) - else: - if match: - logInfo(f'Remove rule for source network {new_rule.src} to SNAT target {snat_target} from POSTROUTING chain at position {position}') - chain.delete_rule(rule) + + if not chain.rules: + # if there are no rules in the chain, insert the new rule directly + logInfo(f'Added POSTROUTING rule for source network {new_rule.src} to SNAT target {snat_target}') + chain.insert_rule(new_rule) + else: + for position, rule in enumerate(chain.rules): + match = all(( + new_rule.get_src() == rule.get_src(), + new_rule.get_dst() == rule.get_dst(), + new_rule.target.parameters == rule.target.parameters, + new_rule.target.name == rule.target.name + )) + if position == 0: + if not match: + logInfo(f'Added POSTROUTING rule for source network {new_rule.src} to SNAT target {snat_target}') + chain.insert_rule(new_rule) + else: + if match: + logInfo(f'Remove rule for source network {new_rule.src} to SNAT target {snat_target} from POSTROUTING chain at position {position}') + chain.delete_rule(rule) + table.commit() table.autocommit = True except: From 1a4f11209a52ac38847ac9562cedf6972b25307b Mon Sep 17 00:00:00 2001 From: Niklas Meyer Date: Fri, 17 Feb 2023 13:22:23 +0100 Subject: [PATCH 12/12] Updated netfilter to 1.51 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d9bad657..7c6c5d6a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -425,7 +425,7 @@ services: - acme netfilter-mailcow: - image: mailcow/netfilter:1.50 + image: mailcow/netfilter:1.51 stop_grace_period: 30s depends_on: - dovecot-mailcow