From unknown Wed Aug 20 05:17:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54578] [PATCH] services: Replace murmur-service-type with mumble-server-service-type. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Mar 2022 09:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54578@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164828581819568 (code B ref -1); Sat, 26 Mar 2022 09:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2022 09:10:18 +0000 Received: from localhost ([127.0.0.1]:53043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nY2R6-00055X-Sv for submit@debbugs.gnu.org; Sat, 26 Mar 2022 05:10:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:37430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nY2R4-00055P-JI for submit@debbugs.gnu.org; Sat, 26 Mar 2022 05:10:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY2R1-0006Uw-O2 for guix-patches@gnu.org; Sat, 26 Mar 2022 05:10:14 -0400 Received: from [2a00:1450:4864:20::541] (port=37778 helo=mail-ed1-x541.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY2Qx-0007dC-KI for guix-patches@gnu.org; Sat, 26 Mar 2022 05:10:10 -0400 Received: by mail-ed1-x541.google.com with SMTP id b15so11623205edn.4 for ; Sat, 26 Mar 2022 02:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=0H5eYwmV9OqqPsC3rcF7fN9E+vE/2ZaRU8vBdwjs5V0=; b=K0e0RqB3nrZt66KF0R/RlbSx3EPnWd7lmVbCbJqPsvnBHpUqTjODt2/qM1SFQ9Fm3W QDC9mmn0w2JZHybYT/j388+NosuLBF+K0CJlw+U6S1QaRqQB+f5S1Do4n6fHRCStSKNI eI7BSkDVrApnpz34vHzUog8+3zcIamCMvCeoGkjtFnZjTHPD4vZv9GULAgOi+5jt2qrj Oi6/dLYV5QR9b5zE5/flsR81PzmyiWDlowdbmXBnpgfLslszSljUF1E0ICGEJU+HXl6p Fl/nKahnwNlIY31Qa6zeRKldUUXzkOcWfT1y5vicXHfJbkwdC3c/Qwg6zw60OgtQoEWV Cqgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=0H5eYwmV9OqqPsC3rcF7fN9E+vE/2ZaRU8vBdwjs5V0=; b=RJ7MeHVarvIRSbxBniUZ0SVFcWRJLQTgrmfZqIfnD7sADocxg7aLnzWn+Dp+oBCUA2 mmph9MfPrS7/0hptjsSLCRqZMD2YGH9ebMsgra5Fl0KdB3CUgNmC+vxDI3q8SDZRGxLc +H0j/O0FOcO1i5ET+46gVdATMB+pxh+7nbm44gECSN3SFEdUCTaLtcGbkxqhn7wADQOx KyvSEI24TFd/g463geiFxxIBJ79nFGoj/sRzAKc+BqyiU4L7vkre8lIyeG26mA8VY4R7 KjMhrzgjZzdjF0Bz4dXv6o2n3AHovZocrGIP0Q4Yx0ARv0eLMoehkF/ihksQrbLIgvh8 w9BA== X-Gm-Message-State: AOAM531/o20DwquQLFcIX0WdsJRcxRuwnK55YC/vJACHbqOI422OO3WF jZrAc1M2tmUHu6xFtyKfG87ie1XMeeM= X-Google-Smtp-Source: ABdhPJxcmOZx7R1jbNNk+7MHLRzLAiYurKJyIdShHZHLd+gFkhGlNv/+ywK6u3xVXleGvALoRc9SEw== X-Received: by 2002:a05:6402:3715:b0:410:a415:fd95 with SMTP id ek21-20020a056402371500b00410a415fd95mr3273743edb.288.1648285805254; Sat, 26 Mar 2022 02:10:05 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kw3-20020a170907770300b006b2511ea97dsm3303271ejc.42.2022.03.26.02.10.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 02:10:04 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 26 Mar 2022 09:57:18 +0100 Content-Transfer-Encoding: 7bit Message-ID: <5d9c4baf3301eee833fa575f0639760046200a6b.camel@gmail.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::541 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=liliana.prikler@gmail.com; helo=mail-ed1-x541.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/services/telephony.scm (murmur-configuration, make-murmur-configuration) (murmur-configuration?, murmur-configuration-package) (murmur-configuration-user, murmur-configuration-group) (murmur-configuration-port, murmur-configuration-welcome-text) (murmur-configuration-server-password) (murmur-configuration-max-users) (murmur-configuration-max-user-bandwidth) (murmur-configuration-database-file) (murmur-configuration-log-file, murmur-configuration-pid-file) (murmur-configuration-autoban-attempts) (murmur-configuration-autoban-timeframe) (murmur-configuration-autoban-time) (murmur-configuration-opus-threshold) (murmur-configuration-channel-nesting-limit) (murmur-configuration-channelname-regex) (murmur-configuration-username-regex) (murmur-configuration-test-message-length) (murmur-configuration-image-message-length) (murmur-configuration-cert-required?) (murmur-configuration-remember-channel?) (murmur-configuration-allow-html?) (murmur-configuration-allow-ping?) (murmur-configuration-bonjour?) (murmur-configuration-send-version?) (murmur-configuration-log-days) (murmur-configuration-obfuscate-ips?) (murmur-configuration-ssl-cert murmur-configuration-ssl-key) (murmur-configuration-ssl-dh-params murmur-configuration-ssl-ciphers) (murmur-configuration-public-registration) (murmur-configuration-file) (murmur-public-registration-configuration) (make-murmur-public-registration-configuration) (murmur-public-registration-configuration?) (murmur-public-registration-configuration-name) (murmur-public-registration-configuration-url) (murmur-public-registration-configuration-password) (murmur-public-registration-configuration-hostname) (murmur-service-type): Add deprecation alias and rename to ... (mumble-server-configuration, make-mumble-server-configuration) (mumble-server-configuration?, mumble-server-configuration-package) (mumble-server-configuration-user, mumble-server-configuration-group) (mumble-server-configuration-port, mumble-server-configuration-welcome-text) (mumble-server-configuration-server-password) (mumble-server-configuration-max-users) (mumble-server-configuration-max-user-bandwidth) (mumble-server-configuration-database-file) (mumble-server-configuration-log-file, mumble-server-configuration-pid-file) (mumble-server-configuration-autoban-attempts) (mumble-server-configuration-autoban-timeframe) (mumble-server-configuration-autoban-time) (mumble-server-configuration-opus-threshold) (mumble-server-configuration-channel-nesting-limit) (mumble-server-configuration-channelname-regex) (mumble-server-configuration-username-regex) (mumble-server-configuration-test-message-length) (mumble-server-configuration-image-message-length) (mumble-server-configuration-cert-required?) (mumble-server-configuration-remember-channel?) (mumble-server-configuration-allow-html?) (mumble-server-configuration-allow-ping?) (mumble-server-configuration-bonjour?) (mumble-server-configuration-send-version?) (mumble-server-configuration-log-days) (mumble-server-configuration-obfuscate-ips?) (mumble-server-configuration-ssl-cert mumble-server-configuration-ssl-key) (mumble-server-configuration-ssl-dh-params) (mumble-server-configuration-ssl-ciphers) (mumble-server-configuration-public-registration) (mumble-server-configuration-file) (mumble-server-public-registration-configuration) (make-mumble-server-public-registration-configuration) (mumble-server-public-registration-configuration?) (mumble-server-public-registration-configuration-name) (mumble-server-public-registration-configuration-url) (mumble-server-public-registration-configuration-password) (mumble-server-public-registration-configuration-hostname) (mumble-server-service-type): ... these. * doc/guix.texi ("Murmur (VoIP server)"): Rename to ... ("Mumble server"): ... this. Adjust documentation accordingly. --- doc/guix.texi | 72 +++--- gnu/services/telephony.scm | 450 ++++++++++++++++++++++++++----------- 2 files changed, 357 insertions(+), 165 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e8ef4286be..50faeabb83 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24976,21 +24976,20 @@ account fingerprint for a registered username. @end deftp -@subsubheading Murmur (VoIP server) +@subsubheading Mumble server -@cindex Murmur (VoIP server) +@cindex Mumble @cindex VoIP server -This section describes how to set up and run a Murmur server. Murmur is -the server of the @uref{https://mumble.info, Mumble} voice-over-IP -(VoIP) suite. +This section describes how to set up and run a +@uref{https://mumble.info, Mumble} server. -@deftp {Data Type} murmur-configuration -The service type for the Murmur server. An example configuration can +@deftp {Data Type} mumble-server-configuration +The service type for the Mumble server. An example configuration can look like this: @lisp -(service murmur-service-type - (murmur-configuration +(service mumble-server-service-type + (mumble-server-configuration (welcome-text "Welcome to this Mumble server running on Guix!") (cert-required? #t) ;disallow text password logins @@ -24998,7 +24997,8 @@ look like this: (ssl-key "/etc/letsencrypt/live/mumble.example.com/privkey.pem"))) @end lisp -After reconfiguring your system, you can manually set the murmur @code{SuperUser} +After reconfiguring your system, you can manually set the mumble-server +@code{SuperUser} password with the command that is printed during the activation phase. It is recommended to register a normal Mumble user account @@ -25010,17 +25010,17 @@ the @code{SuperUser} password that you set previously, and grant your newly registered mumble user administrator or moderator rights and create some channels. -Available @code{murmur-configuration} fields are: +Available @code{mumble-server-configuration} fields are: @table @asis @item @code{package} (default: @code{mumble}) -Package that contains @code{bin/murmurd}. +Package that contains @code{bin/mumble-server}. -@item @code{user} (default: @code{"murmur"}) -User who will run the Murmur server. +@item @code{user} (default: @code{"mumble-server"}) +User who will run the Mumble-Server server. -@item @code{group} (default: @code{"murmur"}) -Group of the user who will run the murmur server. +@item @code{group} (default: @code{"mumble-server"}) +Group of the user who will run the mumble-server server. @item @code{port} (default: @code{64738}) Port on which the server will listen. @@ -25037,11 +25037,11 @@ Maximum of users that can be connected to the server at once. @item @code{max-user-bandwidth} (default: @code{#f}) Maximum voice traffic a user can send per second. -@item @code{database-file} (default: @code{"/var/lib/murmur/db.sqlite"}) +@item @code{database-file} (default: @code{"/var/lib/mumble-server/db.sqlite"}) File name of the sqlite database. The service's user will become the owner of the directory. -@item @code{log-file} (default: @code{"/var/log/murmur/murmur.log"}) +@item @code{log-file} (default: @code{"/var/log/mumble-server/mumble-server.log"}) File name of the log file. The service's user will become the owner of the directory. @@ -25080,8 +25080,9 @@ If it is set to @code{#t} clients that use weak password authentication will not be accepted. Users must have completed the certificate wizard to join. @item @code{remember-channel?} (default: @code{#f}) -Should murmur remember the last channel each user was in when they disconnected -and put them into the remembered channel when they rejoin. +Should mumble-server remember the last channel each user was in when +they disconnected and put them into the remembered channel when they +rejoin. @item @code{allow-html?} (default: @code{#f}) Should html be allowed in text messages, user comments, and channel descriptions. @@ -25097,10 +25098,10 @@ Disabling this setting will prevent public listing of the server. Should the server advertise itself in the local network through the bonjour protocol. @item @code{send-version?} (default: @code{#f}) -Should the murmur server version be exposed in ping requests. +Should the mumble-server server version be exposed in ping requests. @item @code{log-days} (default: @code{31}) -Murmur also stores logs in the database, which are accessible via RPC. +Mumble also stores logs in the database, which are accessible via RPC. The default is 31 days of months, but you can set this setting to 0 to keep logs forever, or -1 to disable logging to the database. @@ -25133,17 +25134,19 @@ This option is specified using @uref{https://www.openssl.org/docs/apps/ciphers.html#CIPHER-LIST-FORMAT, OpenSSL cipher list notation}. -It is recommended that you try your cipher string using 'openssl ciphers ' -before setting it here, to get a feel for which cipher suites you will get. -After setting this option, it is recommend that you inspect your Murmur log -to ensure that Murmur is using the cipher suites that you expected it to. +It is recommended that you try your cipher string using +'openssl ciphers ' before setting it here, to get a feel for +which cipher suites you will get. +After setting this option, it is recommend that you inspect your Mumble +server log to ensure that Mumble is using the cipher suites that you +expected it to. Note: Changing this option may impact the backwards compatibility of your -Murmur server, and can remove the ability for older Mumble clients to be able -to connect to it. +Mumble-Server server, and can remove the ability for older Mumble clients to be able to connect to it. @item @code{public-registration} (default: @code{#f}) -Must be a @code{} record or @code{#f}. +Must be a @code{} +record or @code{#f}. You can optionally register your server in the public server list that the @code{mumble} client shows on startup. @@ -25157,8 +25160,8 @@ Optional alternative override for this configuration. @end table @end deftp -@deftp {Data Type} murmur-public-registration-configuration -Configuration for public registration of a murmur service. +@deftp {Data Type} mumble-server-public-registration-configuration +Configuration for public registration of a mumble-server service. @table @asis @item @code{name} @@ -25178,7 +25181,12 @@ If it is set your server will be linked by this host name instead. @end table @end deftp - +@quotation Deprecation notice +Due to historical reasons, all of the above @code{mumble-server-} +procedures are also exported with the @code{murmur-} prefix. +It is recommended that you switch to using @code{mumble-server-} +going forward. +@end quotation @node File-Sharing Services @subsection File-Sharing Services diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm index 157d96abd6..f68852d8ab 100644 --- a/gnu/services/telephony.scm +++ b/gnu/services/telephony.scm @@ -28,6 +28,7 @@ (define-module (gnu services telephony) #:use-module (gnu packages glib) #:use-module (gnu packages jami) #:use-module (gnu packages telephony) + #:use-module (guix deprecation) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix packages) @@ -56,53 +57,53 @@ (define-module (gnu services telephony) jami-service-type - murmur-configuration - make-murmur-configuration - murmur-configuration? - murmur-configuration-package - murmur-configuration-user - murmur-configuration-group - murmur-configuration-port - murmur-configuration-welcome-text - murmur-configuration-server-password - murmur-configuration-max-users - murmur-configuration-max-user-bandwidth - murmur-configuration-database-file - murmur-configuration-log-file - murmur-configuration-pid-file - murmur-configuration-autoban-attempts - murmur-configuration-autoban-timeframe - murmur-configuration-autoban-time - murmur-configuration-opus-threshold - murmur-configuration-channel-nesting-limit - murmur-configuration-channelname-regex - murmur-configuration-username-regex - murmur-configuration-text-message-length - murmur-configuration-image-message-length - murmur-configuration-cert-required? - murmur-configuration-remember-channel? - murmur-configuration-allow-html? - murmur-configuration-allow-ping? - murmur-configuration-bonjour? - murmur-configuration-send-version? - murmur-configuration-log-days - murmur-configuration-obfuscate-ips? - murmur-configuration-ssl-cert - murmur-configuration-ssl-key - murmur-configuration-ssl-dh-params - murmur-configuration-ssl-ciphers - murmur-configuration-public-registration - murmur-configuration-file - - murmur-public-registration-configuration - make-murmur-public-registration-configuration - murmur-public-registration-configuration? - murmur-public-registration-configuration-name - murmur-public-registration-configuration-url - murmur-public-registration-configuration-password - murmur-public-registration-configuration-hostname - - murmur-service-type)) + mumble-server-configuration + make-mumble-server-configuration + mumble-server-configuration? + mumble-server-configuration-package + mumble-server-configuration-user + mumble-server-configuration-group + mumble-server-configuration-port + mumble-server-configuration-welcome-text + mumble-server-configuration-server-password + mumble-server-configuration-max-users + mumble-server-configuration-max-user-bandwidth + mumble-server-configuration-database-file + mumble-server-configuration-log-file + mumble-server-configuration-pid-file + mumble-server-configuration-autoban-attempts + mumble-server-configuration-autoban-timeframe + mumble-server-configuration-autoban-time + mumble-server-configuration-opus-threshold + mumble-server-configuration-channel-nesting-limit + mumble-server-configuration-channelname-regex + mumble-server-configuration-username-regex + mumble-server-configuration-text-message-length + mumble-server-configuration-image-message-length + mumble-server-configuration-cert-required? + mumble-server-configuration-remember-channel? + mumble-server-configuration-allow-html? + mumble-server-configuration-allow-ping? + mumble-server-configuration-bonjour? + mumble-server-configuration-send-version? + mumble-server-configuration-log-days + mumble-server-configuration-obfuscate-ips? + mumble-server-configuration-ssl-cert + mumble-server-configuration-ssl-key + mumble-server-configuration-ssl-dh-params + mumble-server-configuration-ssl-ciphers + mumble-server-configuration-public-registration + mumble-server-configuration-file + + mumble-server-public-registration-configuration + make-mumble-server-public-registration-configuration + mumble-server-public-registration-configuration? + mumble-server-public-registration-configuration-name + mumble-server-public-registration-configuration-url + mumble-server-public-registration-configuration-password + mumble-server-public-registration-configuration-hostname + + mumble-server-service-type)) ;;; @@ -747,91 +748,91 @@ (define jami-service-type ;;; -;;; Murmur. +;;; Mumble server. ;;; ;; https://github.com/mumble-voip/mumble/blob/master/scripts/murmur.ini -(define-record-type* murmur-configuration - make-murmur-configuration - murmur-configuration? - (package murmur-configuration-package ;file-like +(define-record-type* mumble-server-configuration + make-mumble-server-configuration + mumble-server-configuration? + (package mumble-server-configuration-package ;file-like (default mumble)) - (user murmur-configuration-user - (default "murmur")) - (group murmur-configuration-group - (default "murmur")) - (port murmur-configuration-port + (user mumble-server-configuration-user + (default "mumble-server")) + (group mumble-server-configuration-group + (default "mumble-server")) + (port mumble-server-configuration-port (default 64738)) - (welcome-text murmur-configuration-welcome-text + (welcome-text mumble-server-configuration-welcome-text (default "")) - (server-password murmur-configuration-server-password + (server-password mumble-server-configuration-server-password (default "")) - (max-users murmur-configuration-max-users + (max-users mumble-server-configuration-max-users (default 100)) - (max-user-bandwidth murmur-configuration-max-user-bandwidth + (max-user-bandwidth mumble-server-configuration-max-user-bandwidth (default #f)) - (database-file murmur-configuration-database-file - (default "/var/lib/murmur/db.sqlite")) - (log-file murmur-configuration-log-file - (default "/var/log/murmur/murmur.log")) - (pid-file murmur-configuration-pid-file - (default "/var/run/murmur/murmur.pid")) - (autoban-attempts murmur-configuration-autoban-attempts + (database-file mumble-server-configuration-database-file + (default "/var/lib/mumble-server/db.sqlite")) + (log-file mumble-server-configuration-log-file + (default "/var/log/mumble-server/mumble-server.log")) + (pid-file mumble-server-configuration-pid-file + (default "/var/run/mumble-server/mumble-server.pid")) + (autoban-attempts mumble-server-configuration-autoban-attempts (default 10)) - (autoban-timeframe murmur-configuration-autoban-timeframe + (autoban-timeframe mumble-server-configuration-autoban-timeframe (default 120)) - (autoban-time murmur-configuration-autoban-time + (autoban-time mumble-server-configuration-autoban-time (default 300)) - (opus-threshold murmur-configuration-opus-threshold + (opus-threshold mumble-server-configuration-opus-threshold (default 100)) ; integer percent - (channel-nesting-limit murmur-configuration-channel-nesting-limit + (channel-nesting-limit mumble-server-configuration-channel-nesting-limit (default 10)) - (channelname-regex murmur-configuration-channelname-regex + (channelname-regex mumble-server-configuration-channelname-regex (default #f)) - (username-regex murmur-configuration-username-regex + (username-regex mumble-server-configuration-username-regex (default #f)) - (text-message-length murmur-configuration-text-message-length + (text-message-length mumble-server-configuration-text-message-length (default 5000)) - (image-message-length murmur-configuration-image-message-length + (image-message-length mumble-server-configuration-image-message-length (default (* 128 1024))) ; 128 Kilobytes - (cert-required? murmur-configuration-cert-required? + (cert-required? mumble-server-configuration-cert-required? (default #f)) - (remember-channel? murmur-configuration-remember-channel? + (remember-channel? mumble-server-configuration-remember-channel? (default #f)) - (allow-html? murmur-configuration-allow-html? + (allow-html? mumble-server-configuration-allow-html? (default #f)) - (allow-ping? murmur-configuration-allow-ping? + (allow-ping? mumble-server-configuration-allow-ping? (default #f)) - (bonjour? murmur-configuration-bonjour? + (bonjour? mumble-server-configuration-bonjour? (default #f)) - (send-version? murmur-configuration-send-version? + (send-version? mumble-server-configuration-send-version? (default #f)) - (log-days murmur-configuration-log-days + (log-days mumble-server-configuration-log-days (default 31)) - (obfuscate-ips? murmur-obfuscate-ips? + (obfuscate-ips? mumble-server-obfuscate-ips? (default #t)) - (ssl-cert murmur-configuration-ssl-cert + (ssl-cert mumble-server-configuration-ssl-cert (default #f)) - (ssl-key murmur-configuration-ssl-key + (ssl-key mumble-server-configuration-ssl-key (default #f)) - (ssl-dh-params murmur-configuration-ssl-dh-params + (ssl-dh-params mumble-server-configuration-ssl-dh-params (default #f)) - (ssl-ciphers murmur-configuration-ssl-ciphers + (ssl-ciphers mumble-server-configuration-ssl-ciphers (default #f)) - (public-registration murmur-configuration-public-registration - (default #f)) ; - (file murmur-configuration-file + (public-registration mumble-server-configuration-public-registration + (default #f)) ; + (file mumble-server-configuration-file (default #f))) -(define-record-type* - murmur-public-registration-configuration - make-murmur-public-registration-configuration - murmur-public-registration-configuration? - (name murmur-public-registration-configuration-name) - (password murmur-public-registration-configuration-password) - (url murmur-public-registration-configuration-url) - (hostname murmur-public-registration-configuration-hostname +(define-record-type* + mumble-server-public-registration-configuration + make-mumble-server-public-registration-configuration + mumble-server-public-registration-configuration? + (name mumble-server-public-registration-configuration-name) + (password mumble-server-public-registration-configuration-password) + (url mumble-server-public-registration-configuration-url) + (hostname mumble-server-public-registration-configuration-hostname (default #f))) (define (flatten . lst) @@ -842,10 +843,10 @@ (define (flatten1 head out) (cons head out))) (fold-right flatten1 '() lst)) -(define (default-murmur-config config) +(define (default-mumble-server-config config) (match-record config - + (user port welcome-text server-password max-users max-user-bandwidth database-file log-file pid-file autoban-attempts autoban-timeframe autoban-time opus-threshold channel-nesting-limit channelname-regex @@ -853,7 +854,7 @@ (define (default-murmur-config config) remember-channel? allow-html? allow-ping? bonjour? send-version? log-days obfuscate-ips? ssl-cert ssl-key ssl-dh-params ssl-ciphers public-registration) - (apply mixed-text-file "murmur.ini" + (apply mixed-text-file "mumble-server.ini" (flatten "welcometext=" welcome-text "\n" "port=" (number->string port) "\n" @@ -896,7 +897,7 @@ (define (default-murmur-config config) (match public-registration (#f '()) - (($ + (($ name password url hostname) (if (and (or (not server-password) (string-null? server-password)) allow-ping?) @@ -907,41 +908,41 @@ (define (default-murmur-config config) (if hostname (string-append "registerHostname=" hostname "\n") "")) - (error "To publicly register your murmur server your server must be publicy visible + (error "To publicly register your mumble-server server your server must be publicy visible and users must be able to join without a password. To fix this set: (allow-ping? #t) (server-password \"\") Or set public-registration to #f")))))))) -(define (murmur-activation config) +(define (mumble-server-activation config) #~(begin (use-modules (guix build utils)) - (let* ((log-dir (dirname #$(murmur-configuration-log-file config))) - (pid-dir (dirname #$(murmur-configuration-pid-file config))) - (db-dir (dirname #$(murmur-configuration-database-file config))) - (user (getpwnam #$(murmur-configuration-user config))) + (let* ((log-dir (dirname #$(mumble-server-configuration-log-file config))) + (pid-dir (dirname #$(mumble-server-configuration-pid-file config))) + (db-dir (dirname #$(mumble-server-configuration-database-file config))) + (user (getpwnam #$(mumble-server-configuration-user config))) (init-dir (lambda (name dir) - (format #t "creating murmur ~a directory '~a'\n" name dir) + (format #t "creating mumble-server ~a directory '~a'\n" name dir) (mkdir-p dir) (chown dir (passwd:uid user) (passwd:gid user)) (chmod dir #o700))) - (ini #$(or (murmur-configuration-file config) - (default-murmur-config config)))) + (ini #$(or (mumble-server-configuration-file config) + (default-mumble-server-config config)))) (init-dir "log" log-dir) (init-dir "pid" pid-dir) (init-dir "database" db-dir) - (format #t "murmur: use config file: ~a~%\n" ini) - (format #t "murmur: to set the SuperUser password run: + (format #t "mumble-server: use config file: ~a~%\n" ini) + (format #t "mumble-server: to set the SuperUser password run: `~a -ini ~a -readsupw`\n" - #$(file-append (murmur-configuration-package config) + #$(file-append (mumble-server-configuration-package config) "/bin/mumble-server") ini) #t))) -(define murmur-accounts +(define mumble-server-accounts (match-lambda - (($ _ user group) + (($ _ user group) (list (user-group (name group) @@ -950,37 +951,220 @@ (define murmur-accounts (name user) (group group) (system? #t) - (comment "Murmur Daemon") + (comment "Mumble server daemon") (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))))) -(define (murmur-shepherd-service config) +(define (mumble-server-shepherd-service config) (list (shepherd-service - (provision '(murmur)) - (documentation "Run the Murmur Mumble server.") + (provision '(mumble-server)) + (documentation "Run the Mumble server.") (requirement '(networking)) (start #~(make-forkexec-constructor - '(#$(file-append (murmur-configuration-package config) + '(#$(file-append (mumble-server-configuration-package config) "/bin/mumble-server") "-ini" - #$(or (murmur-configuration-file config) - (default-murmur-config config))) - #:pid-file #$(murmur-configuration-pid-file config))) + #$(or (mumble-server-configuration-file config) + (default-mumble-server-config config))) + #:pid-file #$(mumble-server-configuration-pid-file config))) (stop #~(make-kill-destructor))))) -(define murmur-service-type - (service-type (name 'murmur) +(define mumble-server-service-type + (service-type (name 'mumble-server) (description - "Run the Murmur voice-over-IP (VoIP) server of the Mumble -suite.") + "Run the Mumble voice-over-IP (VoIP) server.") (extensions (list (service-extension shepherd-root-service-type - murmur-shepherd-service) + mumble-server-shepherd-service) (service-extension activation-service-type - murmur-activation) + mumble-server-activation) (service-extension account-service-type - murmur-accounts))) - (default-value (murmur-configuration)))) + mumble-server-accounts))) + (default-value (mumble-server-configuration)))) + + +(define-deprecated/alias + murmur-configuration + mumble-server-configuration) +(define-deprecated/alias + make-murmur-configuration + make-mumble-server-configuration) +(define-deprecated/alias + murmur-configuration? + mumble-server-configuration?) +(define-deprecated/alias + murmur-configuration-package + mumble-server-configuration-package) +(define-deprecated/alias + murmur-configuration-user + mumble-server-configuration-user) +(define-deprecated/alias + murmur-configuration-group + mumble-server-configuration-group) +(define-deprecated/alias + murmur-configuration-port + mumble-server-configuration-port) +(define-deprecated/alias + murmur-configuration-welcome-text + mumble-server-configuration-welcome-text) +(define-deprecated/alias + murmur-configuration-server-password + mumble-server-configuration-server-password) +(define-deprecated/alias + murmur-configuration-max-users + mumble-server-configuration-max-users) +(define-deprecated/alias + murmur-configuration-max-user-bandwidth + mumble-server-configuration-max-user-bandwidth) +(define-deprecated/alias + murmur-configuration-database-file + mumble-server-configuration-database-file) +(define-deprecated/alias + murmur-configuration-log-file + mumble-server-configuration-log-file) +(define-deprecated/alias + murmur-configuration-pid-file + mumble-server-configuration-pid-file) +(define-deprecated/alias + murmur-configuration-autoban-attempts + mumble-server-configuration-autoban-attempts) +(define-deprecated/alias + murmur-configuration-autoban-timeframe + mumble-server-configuration-autoban-timeframe) +(define-deprecated/alias + murmur-configuration-autoban-time + mumble-server-configuration-autoban-time) +(define-deprecated/alias + murmur-configuration-opus-threshold + mumble-server-configuration-opus-threshold) +(define-deprecated/alias + murmur-configuration-channel-nesting-limit + mumble-server-configuration-channel-nesting-limit) +(define-deprecated/alias + murmur-configuration-channelname-regex + mumble-server-configuration-channelname-regex) +(define-deprecated/alias + murmur-configuration-username-regex + mumble-server-configuration-username-regex) +(define-deprecated/alias + murmur-configuration-text-message-length + mumble-server-configuration-text-message-length) +(define-deprecated/alias + murmur-configuration-image-message-length + mumble-server-configuration-image-message-length) +(define-deprecated/alias + murmur-configuration-cert-required? + mumble-server-configuration-cert-required?) +(define-deprecated/alias + murmur-configuration-remember-channel? + mumble-server-configuration-remember-channel?) +(define-deprecated/alias + murmur-configuration-allow-html? + mumble-server-configuration-allow-html?) +(define-deprecated/alias + murmur-configuration-allow-ping? + mumble-server-configuration-allow-ping?) +(define-deprecated/alias + murmur-configuration-bonjour? + mumble-server-configuration-bonjour?) +(define-deprecated/alias + murmur-configuration-send-version? + mumble-server-configuration-send-version?) +(define-deprecated/alias + murmur-configuration-log-days + mumble-server-configuration-log-days) +(define-deprecated/alias + murmur-configuration-obfuscate-ips? + mumble-server-configuration-obfuscate-ips?) +(define-deprecated/alias + murmur-configuration-ssl-cert + mumble-server-configuration-ssl-cert) +(define-deprecated/alias + murmur-configuration-ssl-key + mumble-server-configuration-ssl-key) +(define-deprecated/alias + murmur-configuration-ssl-dh-params + mumble-server-configuration-ssl-dh-params) +(define-deprecated/alias + murmur-configuration-ssl-ciphers + mumble-server-configuration-ssl-ciphers) +(define-deprecated/alias + murmur-configuration-public-registration + mumble-server-configuration-public-registration) +(define-deprecated/alias + murmur-configuration-file + mumble-server-configuration-file) +(export murmur-configuration) +(export make-murmur-configuration) +(export murmur-configuration?) +(export murmur-configuration-package) +(export murmur-configuration-user) +(export murmur-configuration-group) +(export murmur-configuration-port) +(export murmur-configuration-welcome-text) +(export murmur-configuration-server-password) +(export murmur-configuration-max-users) +(export murmur-configuration-max-user-bandwidth) +(export murmur-configuration-database-file) +(export murmur-configuration-log-file) +(export murmur-configuration-pid-file) +(export murmur-configuration-autoban-attempts) +(export murmur-configuration-autoban-timeframe) +(export murmur-configuration-autoban-time) +(export murmur-configuration-opus-threshold) +(export murmur-configuration-channel-nesting-limit) +(export murmur-configuration-channelname-regex) +(export murmur-configuration-username-regex) +(export murmur-configuration-text-message-length) +(export murmur-configuration-image-message-length) +(export murmur-configuration-cert-required?) +(export murmur-configuration-remember-channel?) +(export murmur-configuration-allow-html?) +(export murmur-configuration-allow-ping?) +(export murmur-configuration-bonjour?) +(export murmur-configuration-send-version?) +(export murmur-configuration-log-days) +(export murmur-configuration-obfuscate-ips?) +(export murmur-configuration-ssl-cert) +(export murmur-configuration-ssl-key) +(export murmur-configuration-ssl-dh-params) +(export murmur-configuration-ssl-ciphers) +(export murmur-configuration-public-registration) +(export murmur-configuration-file) + +(define-deprecated/alias + murmur-public-registration-configuration + mumble-server-public-registration-configuration) +(define-deprecated/alias + make-murmur-public-registration-configuration + make-mumble-server-public-registration-configuration) +(define-deprecated/alias + murmur-public-registration-configuration? + mumble-server-public-registration-configuration?) +(define-deprecated/alias + murmur-public-registration-configuration-name + mumble-server-public-registration-configuration-name) +(define-deprecated/alias + murmur-public-registration-configuration-url + mumble-server-public-registration-configuration-url) +(define-deprecated/alias + murmur-public-registration-configuration-password + mumble-server-public-registration-configuration-password) +(define-deprecated/alias + murmur-public-registration-configuration-hostname + mumble-server-public-registration-configuration-hostname) +(export murmur-public-registration-configuration) +(export make-murmur-public-registration-configuration) +(export murmur-public-registration-configuration?) +(export murmur-public-registration-configuration-name) +(export murmur-public-registration-configuration-url) +(export murmur-public-registration-configuration-password) +(export murmur-public-registration-configuration-hostname) + +(define-deprecated/alias + murmur-service-type + mumble-server-service-type) +(export murmur-service-type) ;; Local Variables: ;; eval: (put 'with-retries 'scheme-indent-function 2) -- 2.34.0 From unknown Wed Aug 20 05:17:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54578] [PATCH] services: Replace murmur-service-type with mumble-server-service-type. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Mar 2022 09:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 54578@debbugs.gnu.org Received: via spool by 54578-submit@debbugs.gnu.org id=B54578.16485468395277 (code B ref 54578); Tue, 29 Mar 2022 09:41:02 +0000 Received: (at 54578) by debbugs.gnu.org; 29 Mar 2022 09:40:39 +0000 Received: from localhost ([127.0.0.1]:59857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ8L9-0001N3-By for submit@debbugs.gnu.org; Tue, 29 Mar 2022 05:40:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ8L8-0001Mo-5H for 54578@debbugs.gnu.org; Tue, 29 Mar 2022 05:40:38 -0400 Received: from [2001:470:142:3::e] (port=60794 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZ8L2-0000Vf-OW; Tue, 29 Mar 2022 05:40:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=ZLeiwEgKSXslt74qGhDsQvjyVptHFIwDPLmB6R7VmWo=; b=Q3brCxUXxDa13QfDGxsi iag5WWE4f9e6B2UK3jM/sl3SImRPta5zTt4IklJNKsvU20w4etUPJfEcYPN1fhw4LiJpzgssSBUkO C4CE81hxDjttTYEzXW/fl+9YdSz7MCIBM1oA5uhTwx2e0C2dV2cQtml+tAc3rLkqRtZJELGVmsq28 0x6LMl+u2XceREc2Zq6NgQDn8nGRmWDbbE+6Aadq0LqWh4jTNElQmvL7qWlDwWHJ7K9m3ffu8KQvz blE6I7KYMMpKWy16iim5PLrGr7tfzpBYNhsgX8i6mQtiQOpRrmu3n4AqgHGBnvbHbYcdZuA+xo03c AciqhtL4NfJHYA==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=38672 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZ8Kl-0003Ke-Rw; Tue, 29 Mar 2022 05:40:21 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <5d9c4baf3301eee833fa575f0639760046200a6b.camel@gmail.com> Date: Tue, 29 Mar 2022 11:40:13 +0200 In-Reply-To: <5d9c4baf3301eee833fa575f0639760046200a6b.camel@gmail.com> (Liliana Marie Prikler's message of "Sat, 26 Mar 2022 09:57:18 +0100") Message-ID: <87y20t2j2a.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Great job! Liliana Marie Prikler skribis: [...] > -@subsubheading Murmur (VoIP server) > +@subsubheading Mumble server >=20=20 > -@cindex Murmur (VoIP server) > +@cindex Mumble > @cindex VoIP server > -This section describes how to set up and run a Murmur server. Murmur is > -the server of the @uref{https://mumble.info, Mumble} voice-over-IP > -(VoIP) suite. > +This section describes how to set up and run a > +@uref{https://mumble.info, Mumble} server. Perhaps you can add =E2=80=9Cformerly known as Murmur=E2=80=9D and keep =E2= =80=9C@cindex Murmur=E2=80=9D? > +(define-deprecated/alias > + murmur-configuration > + mumble-server-configuration) > +(define-deprecated/alias > + make-murmur-configuration > + make-mumble-server-configuration) [...] > +(export murmur-configuration) > +(export make-murmur-configuration) Perhaps you can define a =E2=80=98define-public-deprecated/alias=E2=80=99 m= acro to reduce boilerplate. Feel free to push with changes along these lines. Thank you! Ludo=E2=80=99. From unknown Wed Aug 20 05:17:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54578] [PATCH 1/2] guix: Add define-deprecated/public-alias. References: <5d9c4baf3301eee833fa575f0639760046200a6b.camel@gmail.com> In-Reply-To: <5d9c4baf3301eee833fa575f0639760046200a6b.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Mar 2022 19:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 54578@debbugs.gnu.org Received: via spool by 54578-submit@debbugs.gnu.org id=B54578.164858168116672 (code B ref 54578); Tue, 29 Mar 2022 19:22:02 +0000 Received: (at 54578) by debbugs.gnu.org; 29 Mar 2022 19:21:21 +0000 Received: from localhost ([127.0.0.1]:33541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZHP7-0004Kq-9t for submit@debbugs.gnu.org; Tue, 29 Mar 2022 15:21:21 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:41874) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZHP5-0004Kb-4k for 54578@debbugs.gnu.org; Tue, 29 Mar 2022 15:21:19 -0400 Received: by mail-ej1-f66.google.com with SMTP id a8so36992793ejc.8 for <54578@debbugs.gnu.org>; Tue, 29 Mar 2022 12:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=Qe2g3CcP2ROPsnuDh65OtfxRWYDIa83vQdKCxoX8wCI=; b=h09R9SgA400/Hfzc69xIwVcpMSIw+VCPhc1+KHqMeqmqvFFDS56bjj58GchfWEhLj6 F340k4+s/khi8SbkylpPWUWCc9okTZ2868hGgkiJ/VgHsiMYw3NIQ+M02BuwXNtH4+Ji 5I7b7LP8N4ebQP/+rVWnRESYbUp/HLDTo09drU7XIyo5LCXu/NGl5XkAuQYaLTEZhH57 3LeApFg/AaRuSc+ckU0IUs56wKKX+ydc+sXiE1lmF3lym7ouTw7OacxgA9WlngW8mszK hGrKSNSGNWQ+tNB+7gjBd8HkDNPZvu1QkxW5T5DKLVHRUuQg87+JsygY8IIiIMThXD0i gHCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=Qe2g3CcP2ROPsnuDh65OtfxRWYDIa83vQdKCxoX8wCI=; b=vtfu91hV2Vq9Ga+NySDSpaF9xxwvaTpNKnPN2FthzmNiSG3P9qGPZACgZrOSvwiroE YM9LEPv3bLaxS+ad0OhRWh4qmRMmkcgCkqqTjL9eftBKkUhboYNH/m07N0+x7jsfczRU haQnspsm3ZC08MvTQvYVj1x0PmicJUPpeIK4INEUVpeuTqx1TjW1AIspfS2gAwUD7a4a lYZ0LgirO59numpX8B0doDhPFoXg55yuBmHNqvEVaYeoRddqLzmLrrcJmutDPr2vkOVb xiGT29VuoXA2t5VlhB8fZdlyBXNmvIsBeHKByOpW5QcvYTUlBS/eMSZcRbPea63a5+sQ x1VQ== X-Gm-Message-State: AOAM532zhapt7j1GvJEsenjMasthddhDOkQ4SCHbPCwfoUpQeVNTKXnc p5YZIQs0G1gkPxbt9VJNd1+zuhuT810= X-Google-Smtp-Source: ABdhPJwPSixuA7uS3CK7z84vJgfZVJGdwySk/94UJlFPomDfuzIJSMxZHO8r7D3Cvu/aQQLKXdderA== X-Received: by 2002:a17:907:6d0e:b0:6d7:c85:5bf5 with SMTP id sa14-20020a1709076d0e00b006d70c855bf5mr37149332ejc.31.1648581673170; Tue, 29 Mar 2022 12:21:13 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id i11-20020a05640242cb00b0041922d3ce3bsm9031973edc.26.2022.03.29.12.21.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 12:21:12 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 29 Mar 2022 21:16:35 +0200 Content-Transfer-Encoding: 7bit Message-ID: <06c24c012347d2148f26a79e71213e7edb122f42.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/deprecation.scm (define-deprecated/public-alias): New variable. --- guix/deprecation.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guix/deprecation.scm b/guix/deprecation.scm index 09a27789c9..8147a01e24 100644 --- a/guix/deprecation.scm +++ b/guix/deprecation.scm @@ -25,6 +25,7 @@ (define-module (guix deprecation) define-deprecated/public define-deprecated/alias + define-deprecated/public-alias warn-about-old-daemon warn-about-deprecation)) @@ -124,3 +125,10 @@ (define-syntax deprecated (id (identifier? #'id) #'replacement))))) + +(define-syntax-rule (define-deprecated/public-alias deprecated replacement) + "Like define-deprecated/alias, but exporting DEPRECATED. +It is assumed, that REPLACEMENT is already public." + (begin + (define-deprecated/alias deprecated replacement) + (export deprecated))) -- 2.34.0 From unknown Wed Aug 20 05:17:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54578] [PATCH 2/2] services: Replace murmur-service-type with mumble-server-service-type. References: <5d9c4baf3301eee833fa575f0639760046200a6b.camel@gmail.com> In-Reply-To: <5d9c4baf3301eee833fa575f0639760046200a6b.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Mar 2022 19:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 54578@debbugs.gnu.org Received: via spool by 54578-submit@debbugs.gnu.org id=B54578.164858168516687 (code B ref 54578); Tue, 29 Mar 2022 19:22:02 +0000 Received: (at 54578) by debbugs.gnu.org; 29 Mar 2022 19:21:25 +0000 Received: from localhost ([127.0.0.1]:33543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZHP9-0004L4-JP for submit@debbugs.gnu.org; Tue, 29 Mar 2022 15:21:24 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:36768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZHP6-0004Kd-0d for 54578@debbugs.gnu.org; Tue, 29 Mar 2022 15:21:21 -0400 Received: by mail-ed1-f68.google.com with SMTP id h4so14065608edr.3 for <54578@debbugs.gnu.org>; Tue, 29 Mar 2022 12:21:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=HRqaNMR/Sbyy21dy7ElGNZ4HExEtrEJ86tK/ZEYFlxw=; b=VV92/F08MkmNfV5jWPTooP+jmRRlygKN5vVhH8eVhfwEE6HaS56wnT/aMGF6I5e/LO i6sFvyQjl3X597fdfYkqfbosgCYODoGHYis53tVlz9B+Uuom9sRnXFgg6iKWl0Hmg4hp ZugE24NXkuPyJv9jFt80+HGHYfVp1V0ryBXwC9L1lVLvVClvoAC1idnt/2Nh4PCdYbGw DpCLvue4RLFSTwvXd3iXcRoxBPIrSGwSBqD/s68FB6BBpyG3D2KhXPenMcXP7APAQZjN hoeo9G9AcqAkzlJGlYeTRkVMkpsmOkOHmWYqZ5PQ+tromtbweUlvxNorJ7Y5Vo5ssniJ Z+pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:cc :content-transfer-encoding:message-id:mime-version; bh=HRqaNMR/Sbyy21dy7ElGNZ4HExEtrEJ86tK/ZEYFlxw=; b=SkHoqgk78hoS8uHom6MO3ST2AZELed9bHWXmKVq3Mi7uTUq/6AvwK0jD0l48rj+vNa KSf8EDWGpwzwlRHjBrn3vNkKb51QcKeB1mmTEx0YGeNkUoqOnNZmqosaxG/l7BRoQMEv FjCKpFO0kQODl3OhQMqmcriwwy9ZBiYyjyAJBjE0g0wGhvUskel04B7UqaQr0K4JoOrO H68u9wbU/S5VSqN01lViRffHetkvnxvi6a0SE9ELPPO7sG66Vdxllh7Ptr4RLUroXsnV qsAhg3FPH9pllakeo39G40H0IpHrB8j0E5JGWP/z2kAzCpOVXvn8Dq5oyjk/YIstDo35 wtlQ== X-Gm-Message-State: AOAM532GlkX04adZbHPHmKFU0hubbVX6G3l/Gz9RpizOPqn5KEEPDMNT dK8jw2PzoCHqyfM81yTu7gSKvJp38mY= X-Google-Smtp-Source: ABdhPJzBAG3dZ7/jxKiGF9s0A+xelAr9gQxENlEPyTAnJ1kglIcTNi1dVMLdc76Xwt4vvGNJkiFNVw== X-Received: by 2002:aa7:c755:0:b0:419:2f66:e22c with SMTP id c21-20020aa7c755000000b004192f66e22cmr6335301eds.381.1648581673983; Tue, 29 Mar 2022 12:21:13 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id i11-20020a05640242cb00b0041922d3ce3bsm9031973edc.26.2022.03.29.12.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 12:21:13 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 26 Mar 2022 09:57:18 +0100 Content-Transfer-Encoding: 7bit Message-ID: MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/telephony.scm (murmur-configuration, make-murmur-configuration) (murmur-configuration?, murmur-configuration-package) (murmur-configuration-user, murmur-configuration-group) (murmur-configuration-port, murmur-configuration-welcome-text) (murmur-configuration-server-password) (murmur-configuration-max-users) (murmur-configuration-max-user-bandwidth) (murmur-configuration-database-file) (murmur-configuration-log-file, murmur-configuration-pid-file) (murmur-configuration-autoban-attempts) (murmur-configuration-autoban-timeframe) (murmur-configuration-autoban-time) (murmur-configuration-opus-threshold) (murmur-configuration-channel-nesting-limit) (murmur-configuration-channelname-regex) (murmur-configuration-username-regex) (murmur-configuration-test-message-length) (murmur-configuration-image-message-length) (murmur-configuration-cert-required?) (murmur-configuration-remember-channel?) (murmur-configuration-allow-html?) (murmur-configuration-allow-ping?) (murmur-configuration-bonjour?) (murmur-configuration-send-version?) (murmur-configuration-log-days) (murmur-configuration-obfuscate-ips?) (murmur-configuration-ssl-cert murmur-configuration-ssl-key) (murmur-configuration-ssl-dh-params murmur-configuration-ssl-ciphers) (murmur-configuration-public-registration) (murmur-configuration-file) (murmur-public-registration-configuration) (make-murmur-public-registration-configuration) (murmur-public-registration-configuration?) (murmur-public-registration-configuration-name) (murmur-public-registration-configuration-url) (murmur-public-registration-configuration-password) (murmur-public-registration-configuration-hostname) (murmur-service-type): Add deprecation alias and rename to ... (mumble-server-configuration, make-mumble-server-configuration) (mumble-server-configuration?, mumble-server-configuration-package) (mumble-server-configuration-user, mumble-server-configuration-group) (mumble-server-configuration-port, mumble-server-configuration-welcome-text) (mumble-server-configuration-server-password) (mumble-server-configuration-max-users) (mumble-server-configuration-max-user-bandwidth) (mumble-server-configuration-database-file) (mumble-server-configuration-log-file, mumble-server-configuration-pid-file) (mumble-server-configuration-autoban-attempts) (mumble-server-configuration-autoban-timeframe) (mumble-server-configuration-autoban-time) (mumble-server-configuration-opus-threshold) (mumble-server-configuration-channel-nesting-limit) (mumble-server-configuration-channelname-regex) (mumble-server-configuration-username-regex) (mumble-server-configuration-test-message-length) (mumble-server-configuration-image-message-length) (mumble-server-configuration-cert-required?) (mumble-server-configuration-remember-channel?) (mumble-server-configuration-allow-html?) (mumble-server-configuration-allow-ping?) (mumble-server-configuration-bonjour?) (mumble-server-configuration-send-version?) (mumble-server-configuration-log-days) (mumble-server-configuration-obfuscate-ips?) (mumble-server-configuration-ssl-cert mumble-server-configuration-ssl-key) (mumble-server-configuration-ssl-dh-params) (mumble-server-configuration-ssl-ciphers) (mumble-server-configuration-public-registration) (mumble-server-configuration-file) (mumble-server-public-registration-configuration) (make-mumble-server-public-registration-configuration) (mumble-server-public-registration-configuration?) (mumble-server-public-registration-configuration-name) (mumble-server-public-registration-configuration-url) (mumble-server-public-registration-configuration-password) (mumble-server-public-registration-configuration-hostname) (mumble-server-service-type): ... these. * doc/guix.texi ("Murmur (VoIP server)"): Rename to ... ("Mumble server"): ... this. Adjust documentation accordingly. --- doc/guix.texi | 73 ++++--- gnu/services/telephony.scm | 404 +++++++++++++++++++++++++------------ 2 files changed, 312 insertions(+), 165 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e8ef4286be..f42a0a3bc6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24976,21 +24976,21 @@ account fingerprint for a registered username. @end deftp -@subsubheading Murmur (VoIP server) +@subsubheading Mumble server -@cindex Murmur (VoIP server) +@cindex Mumble +@cindex Murmur @cindex VoIP server -This section describes how to set up and run a Murmur server. Murmur is -the server of the @uref{https://mumble.info, Mumble} voice-over-IP -(VoIP) suite. +This section describes how to set up and run a +@uref{https://mumble.info, Mumble} server (formerly known as Murmur). -@deftp {Data Type} murmur-configuration -The service type for the Murmur server. An example configuration can +@deftp {Data Type} mumble-server-configuration +The service type for the Mumble server. An example configuration can look like this: @lisp -(service murmur-service-type - (murmur-configuration +(service mumble-server-service-type + (mumble-server-configuration (welcome-text "Welcome to this Mumble server running on Guix!") (cert-required? #t) ;disallow text password logins @@ -24998,7 +24998,8 @@ look like this: (ssl-key "/etc/letsencrypt/live/mumble.example.com/privkey.pem"))) @end lisp -After reconfiguring your system, you can manually set the murmur @code{SuperUser} +After reconfiguring your system, you can manually set the mumble-server +@code{SuperUser} password with the command that is printed during the activation phase. It is recommended to register a normal Mumble user account @@ -25010,17 +25011,17 @@ the @code{SuperUser} password that you set previously, and grant your newly registered mumble user administrator or moderator rights and create some channels. -Available @code{murmur-configuration} fields are: +Available @code{mumble-server-configuration} fields are: @table @asis @item @code{package} (default: @code{mumble}) -Package that contains @code{bin/murmurd}. +Package that contains @code{bin/mumble-server}. -@item @code{user} (default: @code{"murmur"}) -User who will run the Murmur server. +@item @code{user} (default: @code{"mumble-server"}) +User who will run the Mumble-Server server. -@item @code{group} (default: @code{"murmur"}) -Group of the user who will run the murmur server. +@item @code{group} (default: @code{"mumble-server"}) +Group of the user who will run the mumble-server server. @item @code{port} (default: @code{64738}) Port on which the server will listen. @@ -25037,11 +25038,11 @@ Maximum of users that can be connected to the server at once. @item @code{max-user-bandwidth} (default: @code{#f}) Maximum voice traffic a user can send per second. -@item @code{database-file} (default: @code{"/var/lib/murmur/db.sqlite"}) +@item @code{database-file} (default: @code{"/var/lib/mumble-server/db.sqlite"}) File name of the sqlite database. The service's user will become the owner of the directory. -@item @code{log-file} (default: @code{"/var/log/murmur/murmur.log"}) +@item @code{log-file} (default: @code{"/var/log/mumble-server/mumble-server.log"}) File name of the log file. The service's user will become the owner of the directory. @@ -25080,8 +25081,9 @@ If it is set to @code{#t} clients that use weak password authentication will not be accepted. Users must have completed the certificate wizard to join. @item @code{remember-channel?} (default: @code{#f}) -Should murmur remember the last channel each user was in when they disconnected -and put them into the remembered channel when they rejoin. +Should mumble-server remember the last channel each user was in when +they disconnected and put them into the remembered channel when they +rejoin. @item @code{allow-html?} (default: @code{#f}) Should html be allowed in text messages, user comments, and channel descriptions. @@ -25097,10 +25099,10 @@ Disabling this setting will prevent public listing of the server. Should the server advertise itself in the local network through the bonjour protocol. @item @code{send-version?} (default: @code{#f}) -Should the murmur server version be exposed in ping requests. +Should the mumble-server server version be exposed in ping requests. @item @code{log-days} (default: @code{31}) -Murmur also stores logs in the database, which are accessible via RPC. +Mumble also stores logs in the database, which are accessible via RPC. The default is 31 days of months, but you can set this setting to 0 to keep logs forever, or -1 to disable logging to the database. @@ -25133,17 +25135,19 @@ This option is specified using @uref{https://www.openssl.org/docs/apps/ciphers.html#CIPHER-LIST-FORMAT, OpenSSL cipher list notation}. -It is recommended that you try your cipher string using 'openssl ciphers ' -before setting it here, to get a feel for which cipher suites you will get. -After setting this option, it is recommend that you inspect your Murmur log -to ensure that Murmur is using the cipher suites that you expected it to. +It is recommended that you try your cipher string using +'openssl ciphers ' before setting it here, to get a feel for +which cipher suites you will get. +After setting this option, it is recommend that you inspect your Mumble +server log to ensure that Mumble is using the cipher suites that you +expected it to. Note: Changing this option may impact the backwards compatibility of your -Murmur server, and can remove the ability for older Mumble clients to be able -to connect to it. +Mumble-Server server, and can remove the ability for older Mumble clients to be able to connect to it. @item @code{public-registration} (default: @code{#f}) -Must be a @code{} record or @code{#f}. +Must be a @code{} +record or @code{#f}. You can optionally register your server in the public server list that the @code{mumble} client shows on startup. @@ -25157,8 +25161,8 @@ Optional alternative override for this configuration. @end table @end deftp -@deftp {Data Type} murmur-public-registration-configuration -Configuration for public registration of a murmur service. +@deftp {Data Type} mumble-server-public-registration-configuration +Configuration for public registration of a mumble-server service. @table @asis @item @code{name} @@ -25178,7 +25182,12 @@ If it is set your server will be linked by this host name instead. @end table @end deftp - +@quotation Deprecation notice +Due to historical reasons, all of the above @code{mumble-server-} +procedures are also exported with the @code{murmur-} prefix. +It is recommended that you switch to using @code{mumble-server-} +going forward. +@end quotation @node File-Sharing Services @subsection File-Sharing Services diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm index 157d96abd6..d8ebc7b39d 100644 --- a/gnu/services/telephony.scm +++ b/gnu/services/telephony.scm @@ -28,6 +28,7 @@ (define-module (gnu services telephony) #:use-module (gnu packages glib) #:use-module (gnu packages jami) #:use-module (gnu packages telephony) + #:use-module (guix deprecation) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix packages) @@ -56,53 +57,53 @@ (define-module (gnu services telephony) jami-service-type - murmur-configuration - make-murmur-configuration - murmur-configuration? - murmur-configuration-package - murmur-configuration-user - murmur-configuration-group - murmur-configuration-port - murmur-configuration-welcome-text - murmur-configuration-server-password - murmur-configuration-max-users - murmur-configuration-max-user-bandwidth - murmur-configuration-database-file - murmur-configuration-log-file - murmur-configuration-pid-file - murmur-configuration-autoban-attempts - murmur-configuration-autoban-timeframe - murmur-configuration-autoban-time - murmur-configuration-opus-threshold - murmur-configuration-channel-nesting-limit - murmur-configuration-channelname-regex - murmur-configuration-username-regex - murmur-configuration-text-message-length - murmur-configuration-image-message-length - murmur-configuration-cert-required? - murmur-configuration-remember-channel? - murmur-configuration-allow-html? - murmur-configuration-allow-ping? - murmur-configuration-bonjour? - murmur-configuration-send-version? - murmur-configuration-log-days - murmur-configuration-obfuscate-ips? - murmur-configuration-ssl-cert - murmur-configuration-ssl-key - murmur-configuration-ssl-dh-params - murmur-configuration-ssl-ciphers - murmur-configuration-public-registration - murmur-configuration-file - - murmur-public-registration-configuration - make-murmur-public-registration-configuration - murmur-public-registration-configuration? - murmur-public-registration-configuration-name - murmur-public-registration-configuration-url - murmur-public-registration-configuration-password - murmur-public-registration-configuration-hostname - - murmur-service-type)) + mumble-server-configuration + make-mumble-server-configuration + mumble-server-configuration? + mumble-server-configuration-package + mumble-server-configuration-user + mumble-server-configuration-group + mumble-server-configuration-port + mumble-server-configuration-welcome-text + mumble-server-configuration-server-password + mumble-server-configuration-max-users + mumble-server-configuration-max-user-bandwidth + mumble-server-configuration-database-file + mumble-server-configuration-log-file + mumble-server-configuration-pid-file + mumble-server-configuration-autoban-attempts + mumble-server-configuration-autoban-timeframe + mumble-server-configuration-autoban-time + mumble-server-configuration-opus-threshold + mumble-server-configuration-channel-nesting-limit + mumble-server-configuration-channelname-regex + mumble-server-configuration-username-regex + mumble-server-configuration-text-message-length + mumble-server-configuration-image-message-length + mumble-server-configuration-cert-required? + mumble-server-configuration-remember-channel? + mumble-server-configuration-allow-html? + mumble-server-configuration-allow-ping? + mumble-server-configuration-bonjour? + mumble-server-configuration-send-version? + mumble-server-configuration-log-days + mumble-server-configuration-obfuscate-ips? + mumble-server-configuration-ssl-cert + mumble-server-configuration-ssl-key + mumble-server-configuration-ssl-dh-params + mumble-server-configuration-ssl-ciphers + mumble-server-configuration-public-registration + mumble-server-configuration-file + + mumble-server-public-registration-configuration + make-mumble-server-public-registration-configuration + mumble-server-public-registration-configuration? + mumble-server-public-registration-configuration-name + mumble-server-public-registration-configuration-url + mumble-server-public-registration-configuration-password + mumble-server-public-registration-configuration-hostname + + mumble-server-service-type)) ;;; @@ -747,91 +748,91 @@ (define jami-service-type ;;; -;;; Murmur. +;;; Mumble server. ;;; ;; https://github.com/mumble-voip/mumble/blob/master/scripts/murmur.ini -(define-record-type* murmur-configuration - make-murmur-configuration - murmur-configuration? - (package murmur-configuration-package ;file-like +(define-record-type* mumble-server-configuration + make-mumble-server-configuration + mumble-server-configuration? + (package mumble-server-configuration-package ;file-like (default mumble)) - (user murmur-configuration-user - (default "murmur")) - (group murmur-configuration-group - (default "murmur")) - (port murmur-configuration-port + (user mumble-server-configuration-user + (default "mumble-server")) + (group mumble-server-configuration-group + (default "mumble-server")) + (port mumble-server-configuration-port (default 64738)) - (welcome-text murmur-configuration-welcome-text + (welcome-text mumble-server-configuration-welcome-text (default "")) - (server-password murmur-configuration-server-password + (server-password mumble-server-configuration-server-password (default "")) - (max-users murmur-configuration-max-users + (max-users mumble-server-configuration-max-users (default 100)) - (max-user-bandwidth murmur-configuration-max-user-bandwidth + (max-user-bandwidth mumble-server-configuration-max-user-bandwidth (default #f)) - (database-file murmur-configuration-database-file - (default "/var/lib/murmur/db.sqlite")) - (log-file murmur-configuration-log-file - (default "/var/log/murmur/murmur.log")) - (pid-file murmur-configuration-pid-file - (default "/var/run/murmur/murmur.pid")) - (autoban-attempts murmur-configuration-autoban-attempts + (database-file mumble-server-configuration-database-file + (default "/var/lib/mumble-server/db.sqlite")) + (log-file mumble-server-configuration-log-file + (default "/var/log/mumble-server/mumble-server.log")) + (pid-file mumble-server-configuration-pid-file + (default "/var/run/mumble-server/mumble-server.pid")) + (autoban-attempts mumble-server-configuration-autoban-attempts (default 10)) - (autoban-timeframe murmur-configuration-autoban-timeframe + (autoban-timeframe mumble-server-configuration-autoban-timeframe (default 120)) - (autoban-time murmur-configuration-autoban-time + (autoban-time mumble-server-configuration-autoban-time (default 300)) - (opus-threshold murmur-configuration-opus-threshold + (opus-threshold mumble-server-configuration-opus-threshold (default 100)) ; integer percent - (channel-nesting-limit murmur-configuration-channel-nesting-limit + (channel-nesting-limit mumble-server-configuration-channel-nesting-limit (default 10)) - (channelname-regex murmur-configuration-channelname-regex + (channelname-regex mumble-server-configuration-channelname-regex (default #f)) - (username-regex murmur-configuration-username-regex + (username-regex mumble-server-configuration-username-regex (default #f)) - (text-message-length murmur-configuration-text-message-length + (text-message-length mumble-server-configuration-text-message-length (default 5000)) - (image-message-length murmur-configuration-image-message-length + (image-message-length mumble-server-configuration-image-message-length (default (* 128 1024))) ; 128 Kilobytes - (cert-required? murmur-configuration-cert-required? + (cert-required? mumble-server-configuration-cert-required? (default #f)) - (remember-channel? murmur-configuration-remember-channel? + (remember-channel? mumble-server-configuration-remember-channel? (default #f)) - (allow-html? murmur-configuration-allow-html? + (allow-html? mumble-server-configuration-allow-html? (default #f)) - (allow-ping? murmur-configuration-allow-ping? + (allow-ping? mumble-server-configuration-allow-ping? (default #f)) - (bonjour? murmur-configuration-bonjour? + (bonjour? mumble-server-configuration-bonjour? (default #f)) - (send-version? murmur-configuration-send-version? + (send-version? mumble-server-configuration-send-version? (default #f)) - (log-days murmur-configuration-log-days + (log-days mumble-server-configuration-log-days (default 31)) - (obfuscate-ips? murmur-obfuscate-ips? + (obfuscate-ips? mumble-server-obfuscate-ips? (default #t)) - (ssl-cert murmur-configuration-ssl-cert + (ssl-cert mumble-server-configuration-ssl-cert (default #f)) - (ssl-key murmur-configuration-ssl-key + (ssl-key mumble-server-configuration-ssl-key (default #f)) - (ssl-dh-params murmur-configuration-ssl-dh-params + (ssl-dh-params mumble-server-configuration-ssl-dh-params (default #f)) - (ssl-ciphers murmur-configuration-ssl-ciphers + (ssl-ciphers mumble-server-configuration-ssl-ciphers (default #f)) - (public-registration murmur-configuration-public-registration - (default #f)) ; - (file murmur-configuration-file + (public-registration mumble-server-configuration-public-registration + (default #f)) ; + (file mumble-server-configuration-file (default #f))) -(define-record-type* - murmur-public-registration-configuration - make-murmur-public-registration-configuration - murmur-public-registration-configuration? - (name murmur-public-registration-configuration-name) - (password murmur-public-registration-configuration-password) - (url murmur-public-registration-configuration-url) - (hostname murmur-public-registration-configuration-hostname +(define-record-type* + mumble-server-public-registration-configuration + make-mumble-server-public-registration-configuration + mumble-server-public-registration-configuration? + (name mumble-server-public-registration-configuration-name) + (password mumble-server-public-registration-configuration-password) + (url mumble-server-public-registration-configuration-url) + (hostname mumble-server-public-registration-configuration-hostname (default #f))) (define (flatten . lst) @@ -842,10 +843,10 @@ (define (flatten1 head out) (cons head out))) (fold-right flatten1 '() lst)) -(define (default-murmur-config config) +(define (default-mumble-server-config config) (match-record config - + (user port welcome-text server-password max-users max-user-bandwidth database-file log-file pid-file autoban-attempts autoban-timeframe autoban-time opus-threshold channel-nesting-limit channelname-regex @@ -853,7 +854,7 @@ (define (default-murmur-config config) remember-channel? allow-html? allow-ping? bonjour? send-version? log-days obfuscate-ips? ssl-cert ssl-key ssl-dh-params ssl-ciphers public-registration) - (apply mixed-text-file "murmur.ini" + (apply mixed-text-file "mumble-server.ini" (flatten "welcometext=" welcome-text "\n" "port=" (number->string port) "\n" @@ -896,7 +897,7 @@ (define (default-murmur-config config) (match public-registration (#f '()) - (($ + (($ name password url hostname) (if (and (or (not server-password) (string-null? server-password)) allow-ping?) @@ -907,41 +908,41 @@ (define (default-murmur-config config) (if hostname (string-append "registerHostname=" hostname "\n") "")) - (error "To publicly register your murmur server your server must be publicy visible + (error "To publicly register your mumble-server server your server must be publicy visible and users must be able to join without a password. To fix this set: (allow-ping? #t) (server-password \"\") Or set public-registration to #f")))))))) -(define (murmur-activation config) +(define (mumble-server-activation config) #~(begin (use-modules (guix build utils)) - (let* ((log-dir (dirname #$(murmur-configuration-log-file config))) - (pid-dir (dirname #$(murmur-configuration-pid-file config))) - (db-dir (dirname #$(murmur-configuration-database-file config))) - (user (getpwnam #$(murmur-configuration-user config))) + (let* ((log-dir (dirname #$(mumble-server-configuration-log-file config))) + (pid-dir (dirname #$(mumble-server-configuration-pid-file config))) + (db-dir (dirname #$(mumble-server-configuration-database-file config))) + (user (getpwnam #$(mumble-server-configuration-user config))) (init-dir (lambda (name dir) - (format #t "creating murmur ~a directory '~a'\n" name dir) + (format #t "creating mumble-server ~a directory '~a'\n" name dir) (mkdir-p dir) (chown dir (passwd:uid user) (passwd:gid user)) (chmod dir #o700))) - (ini #$(or (murmur-configuration-file config) - (default-murmur-config config)))) + (ini #$(or (mumble-server-configuration-file config) + (default-mumble-server-config config)))) (init-dir "log" log-dir) (init-dir "pid" pid-dir) (init-dir "database" db-dir) - (format #t "murmur: use config file: ~a~%\n" ini) - (format #t "murmur: to set the SuperUser password run: + (format #t "mumble-server: use config file: ~a~%\n" ini) + (format #t "mumble-server: to set the SuperUser password run: `~a -ini ~a -readsupw`\n" - #$(file-append (murmur-configuration-package config) + #$(file-append (mumble-server-configuration-package config) "/bin/mumble-server") ini) #t))) -(define murmur-accounts +(define mumble-server-accounts (match-lambda - (($ _ user group) + (($ _ user group) (list (user-group (name group) @@ -950,37 +951,174 @@ (define murmur-accounts (name user) (group group) (system? #t) - (comment "Murmur Daemon") + (comment "Mumble server daemon") (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))))) -(define (murmur-shepherd-service config) +(define (mumble-server-shepherd-service config) (list (shepherd-service - (provision '(murmur)) - (documentation "Run the Murmur Mumble server.") + (provision '(mumble-server)) + (documentation "Run the Mumble server.") (requirement '(networking)) (start #~(make-forkexec-constructor - '(#$(file-append (murmur-configuration-package config) + '(#$(file-append (mumble-server-configuration-package config) "/bin/mumble-server") "-ini" - #$(or (murmur-configuration-file config) - (default-murmur-config config))) - #:pid-file #$(murmur-configuration-pid-file config))) + #$(or (mumble-server-configuration-file config) + (default-mumble-server-config config))) + #:pid-file #$(mumble-server-configuration-pid-file config))) (stop #~(make-kill-destructor))))) -(define murmur-service-type - (service-type (name 'murmur) +(define mumble-server-service-type + (service-type (name 'mumble-server) (description - "Run the Murmur voice-over-IP (VoIP) server of the Mumble -suite.") + "Run the Mumble voice-over-IP (VoIP) server.") (extensions (list (service-extension shepherd-root-service-type - murmur-shepherd-service) + mumble-server-shepherd-service) (service-extension activation-service-type - murmur-activation) + mumble-server-activation) (service-extension account-service-type - murmur-accounts))) - (default-value (murmur-configuration)))) + mumble-server-accounts))) + (default-value (mumble-server-configuration)))) + +(define-deprecated/public-alias + murmur-configuration + mumble-server-configuration) +(define-deprecated/public-alias + make-murmur-configuration + make-mumble-server-configuration) +(define-deprecated/public-alias + murmur-configuration? + mumble-server-configuration?) +(define-deprecated/public-alias + murmur-configuration-package + mumble-server-configuration-package) +(define-deprecated/public-alias + murmur-configuration-user + mumble-server-configuration-user) +(define-deprecated/public-alias + murmur-configuration-group + mumble-server-configuration-group) +(define-deprecated/public-alias + murmur-configuration-port + mumble-server-configuration-port) +(define-deprecated/public-alias + murmur-configuration-welcome-text + mumble-server-configuration-welcome-text) +(define-deprecated/public-alias + murmur-configuration-server-password + mumble-server-configuration-server-password) +(define-deprecated/public-alias + murmur-configuration-max-users + mumble-server-configuration-max-users) +(define-deprecated/public-alias + murmur-configuration-max-user-bandwidth + mumble-server-configuration-max-user-bandwidth) +(define-deprecated/public-alias + murmur-configuration-database-file + mumble-server-configuration-database-file) +(define-deprecated/public-alias + murmur-configuration-log-file + mumble-server-configuration-log-file) +(define-deprecated/public-alias + murmur-configuration-pid-file + mumble-server-configuration-pid-file) +(define-deprecated/public-alias + murmur-configuration-autoban-attempts + mumble-server-configuration-autoban-attempts) +(define-deprecated/public-alias + murmur-configuration-autoban-timeframe + mumble-server-configuration-autoban-timeframe) +(define-deprecated/public-alias + murmur-configuration-autoban-time + mumble-server-configuration-autoban-time) +(define-deprecated/public-alias + murmur-configuration-opus-threshold + mumble-server-configuration-opus-threshold) +(define-deprecated/public-alias + murmur-configuration-channel-nesting-limit + mumble-server-configuration-channel-nesting-limit) +(define-deprecated/public-alias + murmur-configuration-channelname-regex + mumble-server-configuration-channelname-regex) +(define-deprecated/public-alias + murmur-configuration-username-regex + mumble-server-configuration-username-regex) +(define-deprecated/public-alias + murmur-configuration-text-message-length + mumble-server-configuration-text-message-length) +(define-deprecated/public-alias + murmur-configuration-image-message-length + mumble-server-configuration-image-message-length) +(define-deprecated/public-alias + murmur-configuration-cert-required? + mumble-server-configuration-cert-required?) +(define-deprecated/public-alias + murmur-configuration-remember-channel? + mumble-server-configuration-remember-channel?) +(define-deprecated/public-alias + murmur-configuration-allow-html? + mumble-server-configuration-allow-html?) +(define-deprecated/public-alias + murmur-configuration-allow-ping? + mumble-server-configuration-allow-ping?) +(define-deprecated/public-alias + murmur-configuration-bonjour? + mumble-server-configuration-bonjour?) +(define-deprecated/public-alias + murmur-configuration-send-version? + mumble-server-configuration-send-version?) +(define-deprecated/public-alias + murmur-configuration-log-days + mumble-server-configuration-log-days) +(define-deprecated/public-alias + murmur-configuration-obfuscate-ips? + mumble-server-configuration-obfuscate-ips?) +(define-deprecated/public-alias + murmur-configuration-ssl-cert + mumble-server-configuration-ssl-cert) +(define-deprecated/public-alias + murmur-configuration-ssl-key + mumble-server-configuration-ssl-key) +(define-deprecated/public-alias + murmur-configuration-ssl-dh-params + mumble-server-configuration-ssl-dh-params) +(define-deprecated/public-alias + murmur-configuration-ssl-ciphers + mumble-server-configuration-ssl-ciphers) +(define-deprecated/public-alias + murmur-configuration-public-registration + mumble-server-configuration-public-registration) +(define-deprecated/public-alias + murmur-configuration-file + mumble-server-configuration-file) + +(define-deprecated/public-alias + murmur-public-registration-configuration + mumble-server-public-registration-configuration) +(define-deprecated/public-alias + make-murmur-public-registration-configuration + make-mumble-server-public-registration-configuration) +(define-deprecated/public-alias + murmur-public-registration-configuration? + mumble-server-public-registration-configuration?) +(define-deprecated/public-alias + murmur-public-registration-configuration-name + mumble-server-public-registration-configuration-name) +(define-deprecated/public-alias + murmur-public-registration-configuration-url + mumble-server-public-registration-configuration-url) +(define-deprecated/public-alias + murmur-public-registration-configuration-password + mumble-server-public-registration-configuration-password) +(define-deprecated/public-alias + murmur-public-registration-configuration-hostname + mumble-server-public-registration-configuration-hostname) + +(define-deprecated/public-alias + murmur-service-type + mumble-server-service-type) ;; Local Variables: ;; eval: (put 'with-retries 'scheme-indent-function 2) -- 2.34.0 From unknown Wed Aug 20 05:17:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#54578] [PATCH 1/2] guix: Add define-deprecated/public-alias. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Mar 2022 20:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54578 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 54578@debbugs.gnu.org Received: via spool by 54578-submit@debbugs.gnu.org id=B54578.16486703795034 (code B ref 54578); Wed, 30 Mar 2022 20:00:02 +0000 Received: (at 54578) by debbugs.gnu.org; 30 Mar 2022 19:59:39 +0000 Received: from localhost ([127.0.0.1]:37096 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZeTj-0001J8-DM for submit@debbugs.gnu.org; Wed, 30 Mar 2022 15:59:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZeTi-0001Iw-7v for 54578@debbugs.gnu.org; Wed, 30 Mar 2022 15:59:38 -0400 Received: from [2001:470:142:3::e] (port=43056 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZeTc-00012u-Sh; Wed, 30 Mar 2022 15:59:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=CD+kDdpg7Et7+ZQXvoaSiczr6xpqdOv3KGyD/IyAQt8=; b=IOZBw/imuWOas7l5Yckg mhrx8StOgs2E4adtAEFjBVuUlSZvLRKH7aqqQvEHXAHZlOXXA4w/bP7S8AWiSbRXkFelbJhzbyAMg 3VzCBCaQR2sCWmhVYz0e9KMvICAet8aBDH05qW+MKLhFS/gXXqdyPnta886q3K2sE6/D2tn6c+cAY 33iAWNUIob6QZatJjzbM79GzkejBdQn/tmfXk1mrpFnzToY2Dv01WxELQ4QHKfyqIuE3OEBUIFDw8 XIRtEjYisJpsUJXmEpjOP5+ELf8Ir399tU+4yPBo+UNuPtLZ91UCTbpVSbClRTTidDUu5MaIbkB+1 ISTjeEaz8XBgsQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:53248 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZeTc-0004F7-Da; Wed, 30 Mar 2022 15:59:32 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <06c24c012347d2148f26a79e71213e7edb122f42.camel@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 10 Germinal an 230 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 30 Mar 2022 21:59:30 +0200 In-Reply-To: <06c24c012347d2148f26a79e71213e7edb122f42.camel@gmail.com> (Liliana Marie Prikler's message of "Tue, 29 Mar 2022 21:16:35 +0200") Message-ID: <87czi3tdnh.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Liliana Marie Prikler skribis: > * guix/deprecation.scm (define-deprecated/public-alias): New variable. [...] > * gnu/services/telephony.scm (murmur-configuration, make-murmur-configura= tion) [...] Both patches LGTM, thank you! Ludo=E2=80=99. From unknown Wed Aug 20 05:17:03 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Liliana Marie Prikler Subject: bug#54578: closed (Re: [PATCH 1/2] guix: Add define-deprecated/public-alias.) Message-ID: References: <8dde22c6dbdcd5f2d4840abb7af9c0668398820e.camel@gmail.com> <5d9c4baf3301eee833fa575f0639760046200a6b.camel@gmail.com> X-Gnu-PR-Message: they-closed 54578 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 54578@debbugs.gnu.org Date: Tue, 12 Apr 2022 18:44:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1649789043-26327-1" This is a multi-part message in MIME format... ------------=_1649789043-26327-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #54578: [PATCH] services: Replace murmur-service-type with mumble-server-se= rvice-type. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 54578@debbugs.gnu.org. --=20 54578: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D54578 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1649789043-26327-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 54578-done) by debbugs.gnu.org; 12 Apr 2022 18:43:07 +0000 Received: from localhost ([127.0.0.1]:49899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neLTZ-0006oC-K3 for submit@debbugs.gnu.org; Tue, 12 Apr 2022 14:43:07 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:42636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1neLTY-0006nv-Ag for 54578-done@debbugs.gnu.org; Tue, 12 Apr 2022 14:42:52 -0400 Received: by mail-ej1-f67.google.com with SMTP id i27so39093934ejd.9 for <54578-done@debbugs.gnu.org>; Tue, 12 Apr 2022 11:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=UZJc3TMhw3a6BEW001GHOvL92yebFZhibCM/mkl7cFk=; b=UUJr0vlOgoSjBx7ikifX2ty2TWrb7fk8R7G2+CYLHWGJlkX/XAgh3SOqjqDr64b0i+ 1o3gns2Qo3VK6R7HHaPDd2gBox/FHrdXmOoZXzLnAqmZ6y5dL9nUKOe7yC0Vb62TsrID asEt4zuUu2KU8BObyhRckq1aMidOoQvtCKz5Z+Wht/uVoCJKAyc3nWo8X35P8DzKeaIV 9ZGjRXNkNgICT4FmLz9tv/0czZf1rajE2opzC/I73N+TVUorcPTMFZcLHeGLi5gs/gDm 32NhKxiV06M1roD7hBHcf+0pDrJ1zrNWCoCA3tPs5eL3CBl5j41kRlOlxe3cwvRG2VZv 4/Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=UZJc3TMhw3a6BEW001GHOvL92yebFZhibCM/mkl7cFk=; b=j0zsx67dAdH3+wlzoyitw1sXfqGV2Bh+0IuMyXMMXH6UaC+23/23yKrXkcbvb6dvId zTjssXIynGRUnzT/G/m9Gjdhd+ZS1sZNG6qT4Kft8ZtcpW3aP2hYCuzq8YoCjgYu5M63 xR/EZY93mWJHoWLmrT4Sr3UFbvMyAWy3QUDy+MTiIdAF1XM1QRk5Tk+rPElGQaFRrU32 /pjLKn10Q2PsSjn7LkYT4TqPDDbR1hDI0uUBCxfCJRK4UU/1p3BSB3OM+Xj1q0nSNNcy UdNVa1NawONfRnLS4+rQN6LA9NileB/9Rmi7O0Sr+y1vWMYSx241FMGmcXw/1RCgJxrN NFMw== X-Gm-Message-State: AOAM530xskS+z8bFViW51alJmxzqm4ugV00mjVTB1qx7UVljleyOUlaX Y/z5zllHnH7M1f3bjW8iukw= X-Google-Smtp-Source: ABdhPJzD1i8UdwgoTAAfmJO3YoNKx0CB7SKHZCS69ozZlwD51RBgj0PkcbvGvpqwRl+zovognPf+wA== X-Received: by 2002:a17:906:c110:b0:6e0:dc2a:3393 with SMTP id do16-20020a170906c11000b006e0dc2a3393mr35255283ejc.512.1649788966485; Tue, 12 Apr 2022 11:42:46 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u19-20020a17090617d300b006cea86ca384sm13357734eje.40.2022.04.12.11.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 11:42:45 -0700 (PDT) Message-ID: <8dde22c6dbdcd5f2d4840abb7af9c0668398820e.camel@gmail.com> Subject: Re: [PATCH 1/2] guix: Add define-deprecated/public-alias. From: Liliana Marie Prikler To: Ludovic =?ISO-8859-1?Q?Court=E8s?= Date: Tue, 12 Apr 2022 20:42:44 +0200 In-Reply-To: <87czi3tdnh.fsf@gnu.org> References: <06c24c012347d2148f26a79e71213e7edb122f42.camel@gmail.com> <87czi3tdnh.fsf@gnu.org> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54578-done Cc: 54578-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 30.03.2022 um 21:59 +0200 schrieb Ludovic Courtès: > Liliana Marie Prikler skribis: > > > * guix/deprecation.scm (define-deprecated/public-alias): New > > variable. > > [...] > > > * gnu/services/telephony.scm (murmur-configuration, make-murmur- > > configuration) > > [...] > > Both patches LGTM, thank you! Thanks, pushed them now. ------------=_1649789043-26327-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 26 Mar 2022 09:10:18 +0000 Received: from localhost ([127.0.0.1]:53043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nY2R6-00055X-Sv for submit@debbugs.gnu.org; Sat, 26 Mar 2022 05:10:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:37430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nY2R4-00055P-JI for submit@debbugs.gnu.org; Sat, 26 Mar 2022 05:10:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nY2R1-0006Uw-O2 for guix-patches@gnu.org; Sat, 26 Mar 2022 05:10:14 -0400 Received: from [2a00:1450:4864:20::541] (port=37778 helo=mail-ed1-x541.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nY2Qx-0007dC-KI for guix-patches@gnu.org; Sat, 26 Mar 2022 05:10:10 -0400 Received: by mail-ed1-x541.google.com with SMTP id b15so11623205edn.4 for ; Sat, 26 Mar 2022 02:10:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=0H5eYwmV9OqqPsC3rcF7fN9E+vE/2ZaRU8vBdwjs5V0=; b=K0e0RqB3nrZt66KF0R/RlbSx3EPnWd7lmVbCbJqPsvnBHpUqTjODt2/qM1SFQ9Fm3W QDC9mmn0w2JZHybYT/j388+NosuLBF+K0CJlw+U6S1QaRqQB+f5S1Do4n6fHRCStSKNI eI7BSkDVrApnpz34vHzUog8+3zcIamCMvCeoGkjtFnZjTHPD4vZv9GULAgOi+5jt2qrj Oi6/dLYV5QR9b5zE5/flsR81PzmyiWDlowdbmXBnpgfLslszSljUF1E0ICGEJU+HXl6p Fl/nKahnwNlIY31Qa6zeRKldUUXzkOcWfT1y5vicXHfJbkwdC3c/Qwg6zw60OgtQoEWV Cqgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=0H5eYwmV9OqqPsC3rcF7fN9E+vE/2ZaRU8vBdwjs5V0=; b=RJ7MeHVarvIRSbxBniUZ0SVFcWRJLQTgrmfZqIfnD7sADocxg7aLnzWn+Dp+oBCUA2 mmph9MfPrS7/0hptjsSLCRqZMD2YGH9ebMsgra5Fl0KdB3CUgNmC+vxDI3q8SDZRGxLc +H0j/O0FOcO1i5ET+46gVdATMB+pxh+7nbm44gECSN3SFEdUCTaLtcGbkxqhn7wADQOx KyvSEI24TFd/g463geiFxxIBJ79nFGoj/sRzAKc+BqyiU4L7vkre8lIyeG26mA8VY4R7 KjMhrzgjZzdjF0Bz4dXv6o2n3AHovZocrGIP0Q4Yx0ARv0eLMoehkF/ihksQrbLIgvh8 w9BA== X-Gm-Message-State: AOAM531/o20DwquQLFcIX0WdsJRcxRuwnK55YC/vJACHbqOI422OO3WF jZrAc1M2tmUHu6xFtyKfG87ie1XMeeM= X-Google-Smtp-Source: ABdhPJxcmOZx7R1jbNNk+7MHLRzLAiYurKJyIdShHZHLd+gFkhGlNv/+ywK6u3xVXleGvALoRc9SEw== X-Received: by 2002:a05:6402:3715:b0:410:a415:fd95 with SMTP id ek21-20020a056402371500b00410a415fd95mr3273743edb.288.1648285805254; Sat, 26 Mar 2022 02:10:05 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id kw3-20020a170907770300b006b2511ea97dsm3303271ejc.42.2022.03.26.02.10.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 02:10:04 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 26 Mar 2022 09:57:18 +0100 Subject: [PATCH] services: Replace murmur-service-type with mumble-server-service-type. to: guix-patches@gnu.org Content-Transfer-Encoding: 7bit Message-ID: <5d9c4baf3301eee833fa575f0639760046200a6b.camel@gmail.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::541 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=liliana.prikler@gmail.com; helo=mail-ed1-x541.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/services/telephony.scm (murmur-configuration, make-murmur-configuration) (murmur-configuration?, murmur-configuration-package) (murmur-configuration-user, murmur-configuration-group) (murmur-configuration-port, murmur-configuration-welcome-text) (murmur-configuration-server-password) (murmur-configuration-max-users) (murmur-configuration-max-user-bandwidth) (murmur-configuration-database-file) (murmur-configuration-log-file, murmur-configuration-pid-file) (murmur-configuration-autoban-attempts) (murmur-configuration-autoban-timeframe) (murmur-configuration-autoban-time) (murmur-configuration-opus-threshold) (murmur-configuration-channel-nesting-limit) (murmur-configuration-channelname-regex) (murmur-configuration-username-regex) (murmur-configuration-test-message-length) (murmur-configuration-image-message-length) (murmur-configuration-cert-required?) (murmur-configuration-remember-channel?) (murmur-configuration-allow-html?) (murmur-configuration-allow-ping?) (murmur-configuration-bonjour?) (murmur-configuration-send-version?) (murmur-configuration-log-days) (murmur-configuration-obfuscate-ips?) (murmur-configuration-ssl-cert murmur-configuration-ssl-key) (murmur-configuration-ssl-dh-params murmur-configuration-ssl-ciphers) (murmur-configuration-public-registration) (murmur-configuration-file) (murmur-public-registration-configuration) (make-murmur-public-registration-configuration) (murmur-public-registration-configuration?) (murmur-public-registration-configuration-name) (murmur-public-registration-configuration-url) (murmur-public-registration-configuration-password) (murmur-public-registration-configuration-hostname) (murmur-service-type): Add deprecation alias and rename to ... (mumble-server-configuration, make-mumble-server-configuration) (mumble-server-configuration?, mumble-server-configuration-package) (mumble-server-configuration-user, mumble-server-configuration-group) (mumble-server-configuration-port, mumble-server-configuration-welcome-text) (mumble-server-configuration-server-password) (mumble-server-configuration-max-users) (mumble-server-configuration-max-user-bandwidth) (mumble-server-configuration-database-file) (mumble-server-configuration-log-file, mumble-server-configuration-pid-file) (mumble-server-configuration-autoban-attempts) (mumble-server-configuration-autoban-timeframe) (mumble-server-configuration-autoban-time) (mumble-server-configuration-opus-threshold) (mumble-server-configuration-channel-nesting-limit) (mumble-server-configuration-channelname-regex) (mumble-server-configuration-username-regex) (mumble-server-configuration-test-message-length) (mumble-server-configuration-image-message-length) (mumble-server-configuration-cert-required?) (mumble-server-configuration-remember-channel?) (mumble-server-configuration-allow-html?) (mumble-server-configuration-allow-ping?) (mumble-server-configuration-bonjour?) (mumble-server-configuration-send-version?) (mumble-server-configuration-log-days) (mumble-server-configuration-obfuscate-ips?) (mumble-server-configuration-ssl-cert mumble-server-configuration-ssl-key) (mumble-server-configuration-ssl-dh-params) (mumble-server-configuration-ssl-ciphers) (mumble-server-configuration-public-registration) (mumble-server-configuration-file) (mumble-server-public-registration-configuration) (make-mumble-server-public-registration-configuration) (mumble-server-public-registration-configuration?) (mumble-server-public-registration-configuration-name) (mumble-server-public-registration-configuration-url) (mumble-server-public-registration-configuration-password) (mumble-server-public-registration-configuration-hostname) (mumble-server-service-type): ... these. * doc/guix.texi ("Murmur (VoIP server)"): Rename to ... ("Mumble server"): ... this. Adjust documentation accordingly. --- doc/guix.texi | 72 +++--- gnu/services/telephony.scm | 450 ++++++++++++++++++++++++++----------- 2 files changed, 357 insertions(+), 165 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e8ef4286be..50faeabb83 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -24976,21 +24976,20 @@ account fingerprint for a registered username. @end deftp -@subsubheading Murmur (VoIP server) +@subsubheading Mumble server -@cindex Murmur (VoIP server) +@cindex Mumble @cindex VoIP server -This section describes how to set up and run a Murmur server. Murmur is -the server of the @uref{https://mumble.info, Mumble} voice-over-IP -(VoIP) suite. +This section describes how to set up and run a +@uref{https://mumble.info, Mumble} server. -@deftp {Data Type} murmur-configuration -The service type for the Murmur server. An example configuration can +@deftp {Data Type} mumble-server-configuration +The service type for the Mumble server. An example configuration can look like this: @lisp -(service murmur-service-type - (murmur-configuration +(service mumble-server-service-type + (mumble-server-configuration (welcome-text "Welcome to this Mumble server running on Guix!") (cert-required? #t) ;disallow text password logins @@ -24998,7 +24997,8 @@ look like this: (ssl-key "/etc/letsencrypt/live/mumble.example.com/privkey.pem"))) @end lisp -After reconfiguring your system, you can manually set the murmur @code{SuperUser} +After reconfiguring your system, you can manually set the mumble-server +@code{SuperUser} password with the command that is printed during the activation phase. It is recommended to register a normal Mumble user account @@ -25010,17 +25010,17 @@ the @code{SuperUser} password that you set previously, and grant your newly registered mumble user administrator or moderator rights and create some channels. -Available @code{murmur-configuration} fields are: +Available @code{mumble-server-configuration} fields are: @table @asis @item @code{package} (default: @code{mumble}) -Package that contains @code{bin/murmurd}. +Package that contains @code{bin/mumble-server}. -@item @code{user} (default: @code{"murmur"}) -User who will run the Murmur server. +@item @code{user} (default: @code{"mumble-server"}) +User who will run the Mumble-Server server. -@item @code{group} (default: @code{"murmur"}) -Group of the user who will run the murmur server. +@item @code{group} (default: @code{"mumble-server"}) +Group of the user who will run the mumble-server server. @item @code{port} (default: @code{64738}) Port on which the server will listen. @@ -25037,11 +25037,11 @@ Maximum of users that can be connected to the server at once. @item @code{max-user-bandwidth} (default: @code{#f}) Maximum voice traffic a user can send per second. -@item @code{database-file} (default: @code{"/var/lib/murmur/db.sqlite"}) +@item @code{database-file} (default: @code{"/var/lib/mumble-server/db.sqlite"}) File name of the sqlite database. The service's user will become the owner of the directory. -@item @code{log-file} (default: @code{"/var/log/murmur/murmur.log"}) +@item @code{log-file} (default: @code{"/var/log/mumble-server/mumble-server.log"}) File name of the log file. The service's user will become the owner of the directory. @@ -25080,8 +25080,9 @@ If it is set to @code{#t} clients that use weak password authentication will not be accepted. Users must have completed the certificate wizard to join. @item @code{remember-channel?} (default: @code{#f}) -Should murmur remember the last channel each user was in when they disconnected -and put them into the remembered channel when they rejoin. +Should mumble-server remember the last channel each user was in when +they disconnected and put them into the remembered channel when they +rejoin. @item @code{allow-html?} (default: @code{#f}) Should html be allowed in text messages, user comments, and channel descriptions. @@ -25097,10 +25098,10 @@ Disabling this setting will prevent public listing of the server. Should the server advertise itself in the local network through the bonjour protocol. @item @code{send-version?} (default: @code{#f}) -Should the murmur server version be exposed in ping requests. +Should the mumble-server server version be exposed in ping requests. @item @code{log-days} (default: @code{31}) -Murmur also stores logs in the database, which are accessible via RPC. +Mumble also stores logs in the database, which are accessible via RPC. The default is 31 days of months, but you can set this setting to 0 to keep logs forever, or -1 to disable logging to the database. @@ -25133,17 +25134,19 @@ This option is specified using @uref{https://www.openssl.org/docs/apps/ciphers.html#CIPHER-LIST-FORMAT, OpenSSL cipher list notation}. -It is recommended that you try your cipher string using 'openssl ciphers ' -before setting it here, to get a feel for which cipher suites you will get. -After setting this option, it is recommend that you inspect your Murmur log -to ensure that Murmur is using the cipher suites that you expected it to. +It is recommended that you try your cipher string using +'openssl ciphers ' before setting it here, to get a feel for +which cipher suites you will get. +After setting this option, it is recommend that you inspect your Mumble +server log to ensure that Mumble is using the cipher suites that you +expected it to. Note: Changing this option may impact the backwards compatibility of your -Murmur server, and can remove the ability for older Mumble clients to be able -to connect to it. +Mumble-Server server, and can remove the ability for older Mumble clients to be able to connect to it. @item @code{public-registration} (default: @code{#f}) -Must be a @code{} record or @code{#f}. +Must be a @code{} +record or @code{#f}. You can optionally register your server in the public server list that the @code{mumble} client shows on startup. @@ -25157,8 +25160,8 @@ Optional alternative override for this configuration. @end table @end deftp -@deftp {Data Type} murmur-public-registration-configuration -Configuration for public registration of a murmur service. +@deftp {Data Type} mumble-server-public-registration-configuration +Configuration for public registration of a mumble-server service. @table @asis @item @code{name} @@ -25178,7 +25181,12 @@ If it is set your server will be linked by this host name instead. @end table @end deftp - +@quotation Deprecation notice +Due to historical reasons, all of the above @code{mumble-server-} +procedures are also exported with the @code{murmur-} prefix. +It is recommended that you switch to using @code{mumble-server-} +going forward. +@end quotation @node File-Sharing Services @subsection File-Sharing Services diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm index 157d96abd6..f68852d8ab 100644 --- a/gnu/services/telephony.scm +++ b/gnu/services/telephony.scm @@ -28,6 +28,7 @@ (define-module (gnu services telephony) #:use-module (gnu packages glib) #:use-module (gnu packages jami) #:use-module (gnu packages telephony) + #:use-module (guix deprecation) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix packages) @@ -56,53 +57,53 @@ (define-module (gnu services telephony) jami-service-type - murmur-configuration - make-murmur-configuration - murmur-configuration? - murmur-configuration-package - murmur-configuration-user - murmur-configuration-group - murmur-configuration-port - murmur-configuration-welcome-text - murmur-configuration-server-password - murmur-configuration-max-users - murmur-configuration-max-user-bandwidth - murmur-configuration-database-file - murmur-configuration-log-file - murmur-configuration-pid-file - murmur-configuration-autoban-attempts - murmur-configuration-autoban-timeframe - murmur-configuration-autoban-time - murmur-configuration-opus-threshold - murmur-configuration-channel-nesting-limit - murmur-configuration-channelname-regex - murmur-configuration-username-regex - murmur-configuration-text-message-length - murmur-configuration-image-message-length - murmur-configuration-cert-required? - murmur-configuration-remember-channel? - murmur-configuration-allow-html? - murmur-configuration-allow-ping? - murmur-configuration-bonjour? - murmur-configuration-send-version? - murmur-configuration-log-days - murmur-configuration-obfuscate-ips? - murmur-configuration-ssl-cert - murmur-configuration-ssl-key - murmur-configuration-ssl-dh-params - murmur-configuration-ssl-ciphers - murmur-configuration-public-registration - murmur-configuration-file - - murmur-public-registration-configuration - make-murmur-public-registration-configuration - murmur-public-registration-configuration? - murmur-public-registration-configuration-name - murmur-public-registration-configuration-url - murmur-public-registration-configuration-password - murmur-public-registration-configuration-hostname - - murmur-service-type)) + mumble-server-configuration + make-mumble-server-configuration + mumble-server-configuration? + mumble-server-configuration-package + mumble-server-configuration-user + mumble-server-configuration-group + mumble-server-configuration-port + mumble-server-configuration-welcome-text + mumble-server-configuration-server-password + mumble-server-configuration-max-users + mumble-server-configuration-max-user-bandwidth + mumble-server-configuration-database-file + mumble-server-configuration-log-file + mumble-server-configuration-pid-file + mumble-server-configuration-autoban-attempts + mumble-server-configuration-autoban-timeframe + mumble-server-configuration-autoban-time + mumble-server-configuration-opus-threshold + mumble-server-configuration-channel-nesting-limit + mumble-server-configuration-channelname-regex + mumble-server-configuration-username-regex + mumble-server-configuration-text-message-length + mumble-server-configuration-image-message-length + mumble-server-configuration-cert-required? + mumble-server-configuration-remember-channel? + mumble-server-configuration-allow-html? + mumble-server-configuration-allow-ping? + mumble-server-configuration-bonjour? + mumble-server-configuration-send-version? + mumble-server-configuration-log-days + mumble-server-configuration-obfuscate-ips? + mumble-server-configuration-ssl-cert + mumble-server-configuration-ssl-key + mumble-server-configuration-ssl-dh-params + mumble-server-configuration-ssl-ciphers + mumble-server-configuration-public-registration + mumble-server-configuration-file + + mumble-server-public-registration-configuration + make-mumble-server-public-registration-configuration + mumble-server-public-registration-configuration? + mumble-server-public-registration-configuration-name + mumble-server-public-registration-configuration-url + mumble-server-public-registration-configuration-password + mumble-server-public-registration-configuration-hostname + + mumble-server-service-type)) ;;; @@ -747,91 +748,91 @@ (define jami-service-type ;;; -;;; Murmur. +;;; Mumble server. ;;; ;; https://github.com/mumble-voip/mumble/blob/master/scripts/murmur.ini -(define-record-type* murmur-configuration - make-murmur-configuration - murmur-configuration? - (package murmur-configuration-package ;file-like +(define-record-type* mumble-server-configuration + make-mumble-server-configuration + mumble-server-configuration? + (package mumble-server-configuration-package ;file-like (default mumble)) - (user murmur-configuration-user - (default "murmur")) - (group murmur-configuration-group - (default "murmur")) - (port murmur-configuration-port + (user mumble-server-configuration-user + (default "mumble-server")) + (group mumble-server-configuration-group + (default "mumble-server")) + (port mumble-server-configuration-port (default 64738)) - (welcome-text murmur-configuration-welcome-text + (welcome-text mumble-server-configuration-welcome-text (default "")) - (server-password murmur-configuration-server-password + (server-password mumble-server-configuration-server-password (default "")) - (max-users murmur-configuration-max-users + (max-users mumble-server-configuration-max-users (default 100)) - (max-user-bandwidth murmur-configuration-max-user-bandwidth + (max-user-bandwidth mumble-server-configuration-max-user-bandwidth (default #f)) - (database-file murmur-configuration-database-file - (default "/var/lib/murmur/db.sqlite")) - (log-file murmur-configuration-log-file - (default "/var/log/murmur/murmur.log")) - (pid-file murmur-configuration-pid-file - (default "/var/run/murmur/murmur.pid")) - (autoban-attempts murmur-configuration-autoban-attempts + (database-file mumble-server-configuration-database-file + (default "/var/lib/mumble-server/db.sqlite")) + (log-file mumble-server-configuration-log-file + (default "/var/log/mumble-server/mumble-server.log")) + (pid-file mumble-server-configuration-pid-file + (default "/var/run/mumble-server/mumble-server.pid")) + (autoban-attempts mumble-server-configuration-autoban-attempts (default 10)) - (autoban-timeframe murmur-configuration-autoban-timeframe + (autoban-timeframe mumble-server-configuration-autoban-timeframe (default 120)) - (autoban-time murmur-configuration-autoban-time + (autoban-time mumble-server-configuration-autoban-time (default 300)) - (opus-threshold murmur-configuration-opus-threshold + (opus-threshold mumble-server-configuration-opus-threshold (default 100)) ; integer percent - (channel-nesting-limit murmur-configuration-channel-nesting-limit + (channel-nesting-limit mumble-server-configuration-channel-nesting-limit (default 10)) - (channelname-regex murmur-configuration-channelname-regex + (channelname-regex mumble-server-configuration-channelname-regex (default #f)) - (username-regex murmur-configuration-username-regex + (username-regex mumble-server-configuration-username-regex (default #f)) - (text-message-length murmur-configuration-text-message-length + (text-message-length mumble-server-configuration-text-message-length (default 5000)) - (image-message-length murmur-configuration-image-message-length + (image-message-length mumble-server-configuration-image-message-length (default (* 128 1024))) ; 128 Kilobytes - (cert-required? murmur-configuration-cert-required? + (cert-required? mumble-server-configuration-cert-required? (default #f)) - (remember-channel? murmur-configuration-remember-channel? + (remember-channel? mumble-server-configuration-remember-channel? (default #f)) - (allow-html? murmur-configuration-allow-html? + (allow-html? mumble-server-configuration-allow-html? (default #f)) - (allow-ping? murmur-configuration-allow-ping? + (allow-ping? mumble-server-configuration-allow-ping? (default #f)) - (bonjour? murmur-configuration-bonjour? + (bonjour? mumble-server-configuration-bonjour? (default #f)) - (send-version? murmur-configuration-send-version? + (send-version? mumble-server-configuration-send-version? (default #f)) - (log-days murmur-configuration-log-days + (log-days mumble-server-configuration-log-days (default 31)) - (obfuscate-ips? murmur-obfuscate-ips? + (obfuscate-ips? mumble-server-obfuscate-ips? (default #t)) - (ssl-cert murmur-configuration-ssl-cert + (ssl-cert mumble-server-configuration-ssl-cert (default #f)) - (ssl-key murmur-configuration-ssl-key + (ssl-key mumble-server-configuration-ssl-key (default #f)) - (ssl-dh-params murmur-configuration-ssl-dh-params + (ssl-dh-params mumble-server-configuration-ssl-dh-params (default #f)) - (ssl-ciphers murmur-configuration-ssl-ciphers + (ssl-ciphers mumble-server-configuration-ssl-ciphers (default #f)) - (public-registration murmur-configuration-public-registration - (default #f)) ; - (file murmur-configuration-file + (public-registration mumble-server-configuration-public-registration + (default #f)) ; + (file mumble-server-configuration-file (default #f))) -(define-record-type* - murmur-public-registration-configuration - make-murmur-public-registration-configuration - murmur-public-registration-configuration? - (name murmur-public-registration-configuration-name) - (password murmur-public-registration-configuration-password) - (url murmur-public-registration-configuration-url) - (hostname murmur-public-registration-configuration-hostname +(define-record-type* + mumble-server-public-registration-configuration + make-mumble-server-public-registration-configuration + mumble-server-public-registration-configuration? + (name mumble-server-public-registration-configuration-name) + (password mumble-server-public-registration-configuration-password) + (url mumble-server-public-registration-configuration-url) + (hostname mumble-server-public-registration-configuration-hostname (default #f))) (define (flatten . lst) @@ -842,10 +843,10 @@ (define (flatten1 head out) (cons head out))) (fold-right flatten1 '() lst)) -(define (default-murmur-config config) +(define (default-mumble-server-config config) (match-record config - + (user port welcome-text server-password max-users max-user-bandwidth database-file log-file pid-file autoban-attempts autoban-timeframe autoban-time opus-threshold channel-nesting-limit channelname-regex @@ -853,7 +854,7 @@ (define (default-murmur-config config) remember-channel? allow-html? allow-ping? bonjour? send-version? log-days obfuscate-ips? ssl-cert ssl-key ssl-dh-params ssl-ciphers public-registration) - (apply mixed-text-file "murmur.ini" + (apply mixed-text-file "mumble-server.ini" (flatten "welcometext=" welcome-text "\n" "port=" (number->string port) "\n" @@ -896,7 +897,7 @@ (define (default-murmur-config config) (match public-registration (#f '()) - (($ + (($ name password url hostname) (if (and (or (not server-password) (string-null? server-password)) allow-ping?) @@ -907,41 +908,41 @@ (define (default-murmur-config config) (if hostname (string-append "registerHostname=" hostname "\n") "")) - (error "To publicly register your murmur server your server must be publicy visible + (error "To publicly register your mumble-server server your server must be publicy visible and users must be able to join without a password. To fix this set: (allow-ping? #t) (server-password \"\") Or set public-registration to #f")))))))) -(define (murmur-activation config) +(define (mumble-server-activation config) #~(begin (use-modules (guix build utils)) - (let* ((log-dir (dirname #$(murmur-configuration-log-file config))) - (pid-dir (dirname #$(murmur-configuration-pid-file config))) - (db-dir (dirname #$(murmur-configuration-database-file config))) - (user (getpwnam #$(murmur-configuration-user config))) + (let* ((log-dir (dirname #$(mumble-server-configuration-log-file config))) + (pid-dir (dirname #$(mumble-server-configuration-pid-file config))) + (db-dir (dirname #$(mumble-server-configuration-database-file config))) + (user (getpwnam #$(mumble-server-configuration-user config))) (init-dir (lambda (name dir) - (format #t "creating murmur ~a directory '~a'\n" name dir) + (format #t "creating mumble-server ~a directory '~a'\n" name dir) (mkdir-p dir) (chown dir (passwd:uid user) (passwd:gid user)) (chmod dir #o700))) - (ini #$(or (murmur-configuration-file config) - (default-murmur-config config)))) + (ini #$(or (mumble-server-configuration-file config) + (default-mumble-server-config config)))) (init-dir "log" log-dir) (init-dir "pid" pid-dir) (init-dir "database" db-dir) - (format #t "murmur: use config file: ~a~%\n" ini) - (format #t "murmur: to set the SuperUser password run: + (format #t "mumble-server: use config file: ~a~%\n" ini) + (format #t "mumble-server: to set the SuperUser password run: `~a -ini ~a -readsupw`\n" - #$(file-append (murmur-configuration-package config) + #$(file-append (mumble-server-configuration-package config) "/bin/mumble-server") ini) #t))) -(define murmur-accounts +(define mumble-server-accounts (match-lambda - (($ _ user group) + (($ _ user group) (list (user-group (name group) @@ -950,37 +951,220 @@ (define murmur-accounts (name user) (group group) (system? #t) - (comment "Murmur Daemon") + (comment "Mumble server daemon") (home-directory "/var/empty") (shell (file-append shadow "/sbin/nologin"))))))) -(define (murmur-shepherd-service config) +(define (mumble-server-shepherd-service config) (list (shepherd-service - (provision '(murmur)) - (documentation "Run the Murmur Mumble server.") + (provision '(mumble-server)) + (documentation "Run the Mumble server.") (requirement '(networking)) (start #~(make-forkexec-constructor - '(#$(file-append (murmur-configuration-package config) + '(#$(file-append (mumble-server-configuration-package config) "/bin/mumble-server") "-ini" - #$(or (murmur-configuration-file config) - (default-murmur-config config))) - #:pid-file #$(murmur-configuration-pid-file config))) + #$(or (mumble-server-configuration-file config) + (default-mumble-server-config config))) + #:pid-file #$(mumble-server-configuration-pid-file config))) (stop #~(make-kill-destructor))))) -(define murmur-service-type - (service-type (name 'murmur) +(define mumble-server-service-type + (service-type (name 'mumble-server) (description - "Run the Murmur voice-over-IP (VoIP) server of the Mumble -suite.") + "Run the Mumble voice-over-IP (VoIP) server.") (extensions (list (service-extension shepherd-root-service-type - murmur-shepherd-service) + mumble-server-shepherd-service) (service-extension activation-service-type - murmur-activation) + mumble-server-activation) (service-extension account-service-type - murmur-accounts))) - (default-value (murmur-configuration)))) + mumble-server-accounts))) + (default-value (mumble-server-configuration)))) + + +(define-deprecated/alias + murmur-configuration + mumble-server-configuration) +(define-deprecated/alias + make-murmur-configuration + make-mumble-server-configuration) +(define-deprecated/alias + murmur-configuration? + mumble-server-configuration?) +(define-deprecated/alias + murmur-configuration-package + mumble-server-configuration-package) +(define-deprecated/alias + murmur-configuration-user + mumble-server-configuration-user) +(define-deprecated/alias + murmur-configuration-group + mumble-server-configuration-group) +(define-deprecated/alias + murmur-configuration-port + mumble-server-configuration-port) +(define-deprecated/alias + murmur-configuration-welcome-text + mumble-server-configuration-welcome-text) +(define-deprecated/alias + murmur-configuration-server-password + mumble-server-configuration-server-password) +(define-deprecated/alias + murmur-configuration-max-users + mumble-server-configuration-max-users) +(define-deprecated/alias + murmur-configuration-max-user-bandwidth + mumble-server-configuration-max-user-bandwidth) +(define-deprecated/alias + murmur-configuration-database-file + mumble-server-configuration-database-file) +(define-deprecated/alias + murmur-configuration-log-file + mumble-server-configuration-log-file) +(define-deprecated/alias + murmur-configuration-pid-file + mumble-server-configuration-pid-file) +(define-deprecated/alias + murmur-configuration-autoban-attempts + mumble-server-configuration-autoban-attempts) +(define-deprecated/alias + murmur-configuration-autoban-timeframe + mumble-server-configuration-autoban-timeframe) +(define-deprecated/alias + murmur-configuration-autoban-time + mumble-server-configuration-autoban-time) +(define-deprecated/alias + murmur-configuration-opus-threshold + mumble-server-configuration-opus-threshold) +(define-deprecated/alias + murmur-configuration-channel-nesting-limit + mumble-server-configuration-channel-nesting-limit) +(define-deprecated/alias + murmur-configuration-channelname-regex + mumble-server-configuration-channelname-regex) +(define-deprecated/alias + murmur-configuration-username-regex + mumble-server-configuration-username-regex) +(define-deprecated/alias + murmur-configuration-text-message-length + mumble-server-configuration-text-message-length) +(define-deprecated/alias + murmur-configuration-image-message-length + mumble-server-configuration-image-message-length) +(define-deprecated/alias + murmur-configuration-cert-required? + mumble-server-configuration-cert-required?) +(define-deprecated/alias + murmur-configuration-remember-channel? + mumble-server-configuration-remember-channel?) +(define-deprecated/alias + murmur-configuration-allow-html? + mumble-server-configuration-allow-html?) +(define-deprecated/alias + murmur-configuration-allow-ping? + mumble-server-configuration-allow-ping?) +(define-deprecated/alias + murmur-configuration-bonjour? + mumble-server-configuration-bonjour?) +(define-deprecated/alias + murmur-configuration-send-version? + mumble-server-configuration-send-version?) +(define-deprecated/alias + murmur-configuration-log-days + mumble-server-configuration-log-days) +(define-deprecated/alias + murmur-configuration-obfuscate-ips? + mumble-server-configuration-obfuscate-ips?) +(define-deprecated/alias + murmur-configuration-ssl-cert + mumble-server-configuration-ssl-cert) +(define-deprecated/alias + murmur-configuration-ssl-key + mumble-server-configuration-ssl-key) +(define-deprecated/alias + murmur-configuration-ssl-dh-params + mumble-server-configuration-ssl-dh-params) +(define-deprecated/alias + murmur-configuration-ssl-ciphers + mumble-server-configuration-ssl-ciphers) +(define-deprecated/alias + murmur-configuration-public-registration + mumble-server-configuration-public-registration) +(define-deprecated/alias + murmur-configuration-file + mumble-server-configuration-file) +(export murmur-configuration) +(export make-murmur-configuration) +(export murmur-configuration?) +(export murmur-configuration-package) +(export murmur-configuration-user) +(export murmur-configuration-group) +(export murmur-configuration-port) +(export murmur-configuration-welcome-text) +(export murmur-configuration-server-password) +(export murmur-configuration-max-users) +(export murmur-configuration-max-user-bandwidth) +(export murmur-configuration-database-file) +(export murmur-configuration-log-file) +(export murmur-configuration-pid-file) +(export murmur-configuration-autoban-attempts) +(export murmur-configuration-autoban-timeframe) +(export murmur-configuration-autoban-time) +(export murmur-configuration-opus-threshold) +(export murmur-configuration-channel-nesting-limit) +(export murmur-configuration-channelname-regex) +(export murmur-configuration-username-regex) +(export murmur-configuration-text-message-length) +(export murmur-configuration-image-message-length) +(export murmur-configuration-cert-required?) +(export murmur-configuration-remember-channel?) +(export murmur-configuration-allow-html?) +(export murmur-configuration-allow-ping?) +(export murmur-configuration-bonjour?) +(export murmur-configuration-send-version?) +(export murmur-configuration-log-days) +(export murmur-configuration-obfuscate-ips?) +(export murmur-configuration-ssl-cert) +(export murmur-configuration-ssl-key) +(export murmur-configuration-ssl-dh-params) +(export murmur-configuration-ssl-ciphers) +(export murmur-configuration-public-registration) +(export murmur-configuration-file) + +(define-deprecated/alias + murmur-public-registration-configuration + mumble-server-public-registration-configuration) +(define-deprecated/alias + make-murmur-public-registration-configuration + make-mumble-server-public-registration-configuration) +(define-deprecated/alias + murmur-public-registration-configuration? + mumble-server-public-registration-configuration?) +(define-deprecated/alias + murmur-public-registration-configuration-name + mumble-server-public-registration-configuration-name) +(define-deprecated/alias + murmur-public-registration-configuration-url + mumble-server-public-registration-configuration-url) +(define-deprecated/alias + murmur-public-registration-configuration-password + mumble-server-public-registration-configuration-password) +(define-deprecated/alias + murmur-public-registration-configuration-hostname + mumble-server-public-registration-configuration-hostname) +(export murmur-public-registration-configuration) +(export make-murmur-public-registration-configuration) +(export murmur-public-registration-configuration?) +(export murmur-public-registration-configuration-name) +(export murmur-public-registration-configuration-url) +(export murmur-public-registration-configuration-password) +(export murmur-public-registration-configuration-hostname) + +(define-deprecated/alias + murmur-service-type + mumble-server-service-type) +(export murmur-service-type) ;; Local Variables: ;; eval: (put 'with-retries 'scheme-indent-function 2) -- 2.34.0 ------------=_1649789043-26327-1--