From d25620be4c545aec1653ecc40ebb7ea2dd1a12ae Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Mon, 11 Mar 2024 22:59:52 +1100 Subject: gnu: services: Add insecure-sasl-mechanisms to prosody configuration. * gnu/services/messaging.scm (prosody-configuration): Add insecure-sasl-mechanisms configuration option. * doc/guix.texi (Messaging Services): Document it. Change-Id: I8d9e42476ea8ad2f89b143ed4a66b4798e418586 Signed-off-by: Liliana Marie Prikler --- gnu/services/messaging.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/services') diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm index 9702170b3e..a914d0f89e 100644 --- a/gnu/services/messaging.scm +++ b/gnu/services/messaging.scm @@ -427,6 +427,12 @@ (define-all-configurations prosody-configuration @url{https://prosody.im/doc/modules/mod_saslauth}." common) + (insecure-sasl-mechanisms + (string-list '("PLAIN" "LOGIN")) + "Set of mechanisms that will not be offered on unencrypted connections. +See @url{https://prosody.im/doc/modules/mod_saslauth}." + common) + (s2s-require-encryption? (boolean #f) "Whether to force all server-to-server connections to be encrypted or not. -- cgit v1.2.3 From 3ea55fada0593cd05c686cef2f6a59ba65933ef5 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sun, 17 Mar 2024 16:47:07 +0800 Subject: services: sddm: Add extension for localed-service-type. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/sddm.scm (sddm-service-type): Add extension for localed-service-type. * gnu/services/xorg.scm (xorg-configuration-keyboard-layout): Export it. Change-Id: I26e6475b733d69f1baf00786e302a3ec6d3c4a74 Signed-off-by: 宋文武 --- gnu/services/sddm.scm | 7 ++++++- gnu/services/xorg.scm | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/services') diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 69c737829b..48695e2806 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019 Ludovic Courtès ;;; Copyright © 2019 Jesse Gildersleve ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -328,7 +329,11 @@ (define sddm-service-type (service-extension account-service-type (const %sddm-accounts)) (service-extension profile-service-type - sddm-profile-service))) + sddm-profile-service) + (service-extension localed-service-type + (compose + xorg-configuration-keyboard-layout + sddm-configuration-xorg)))) (default-value (sddm-configuration)) (description "Run SDDM, a display and log-in manager for X11 and diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 1ee15ea90c..b86e2d3c5b 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Chris Marusich ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 muradm +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,7 @@ (define-module (gnu services xorg) xorg-configuration-extra-config xorg-configuration-server xorg-configuration-server-arguments + xorg-configuration-keyboard-layout %default-xorg-modules %default-xorg-fonts -- cgit v1.2.3