[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/12: services: bitlbee: Remove use of ‘make-forkexec-constructor/conta
|
From: |
guix-commits |
|
Subject: |
05/12: services: bitlbee: Remove use of ‘make-forkexec-constructor/container’. |
|
Date: |
Thu, 21 Dec 2023 18:36:52 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit d3ffa06a4d7da3440492a07f42c138528195bd3f
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Nov 11 16:35:25 2023 +0100
services: bitlbee: Remove use of ‘make-forkexec-constructor/container’.
This will only affect systems running Shepherd < 0.9.0, which was
released in August 2022.
* gnu/services/messaging.scm (bitlbee-shepherd-service): Remove
‘with-imported-modules’ and ‘modules’ field. Use
‘make-forkexec-constructor’ instead of
‘make-forkexec-constructor/container’ when ‘make-inetd-constructor’ is
missing.
Change-Id: I35a0487bccaee4799ad0d81388d540e5c7891f7e
---
gnu/services/messaging.scm | 91 +++++++++++++++++++++-------------------------
1 file changed, 41 insertions(+), 50 deletions(-)
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index c4963936a0..7505810e7c 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -849,56 +849,47 @@ string, you could instantiate a prosody service like this:
(target conf)))
#:namespaces (delq 'net %namespaces))))
- (with-imported-modules (source-module-closure
- '((gnu build shepherd)
- (gnu system file-systems)))
- (list (shepherd-service
- (provision '(bitlbee))
-
- ;; Note: If networking is not up, then /etc/resolv.conf
- ;; doesn't get mapped in the container, hence the dependency
- ;; on 'networking'.
- (requirement '(user-processes networking))
-
- (modules '((gnu build shepherd)
- (gnu system file-systems)))
- (start #~(if (defined? 'make-inetd-constructor)
-
- (make-inetd-constructor
- (list #$bitlbee* "-I" "-c" #$conf)
- (list (endpoint
- (addrinfo:addr
- (car (getaddrinfo #$interface
- #$(number->string port)
- (logior AI_NUMERICHOST
-
AI_NUMERICSERV))))))
- #:requirements '#$requirement
- #:service-name-stem "bitlbee"
- #:user "bitlbee" #:group "bitlbee"
-
- ;; Allow 'bitlbee-purple' to use libpurple
plugins.
- #:environment-variables
- (list (string-append "PURPLE_PLUGIN_PATH="
- #$plugins "/lib/purple-2")
- "GUIX_LOCPATH=/run/current-system/locale"))
-
- (make-forkexec-constructor/container
- (list #$(file-append bitlbee "/sbin/bitlbee")
- "-n" "-F" "-u" "bitlbee" "-c" #$conf)
-
- ;; Allow 'bitlbee-purple' to use libpurple
plugins.
- #:environment-variables
- (list (string-append "PURPLE_PLUGIN_PATH="
- #$plugins "/lib/purple-2"))
-
- #:pid-file "/var/run/bitlbee.pid"
- #:mappings (list (file-system-mapping
- (source "/var/lib/bitlbee")
- (target source)
- (writable? #t))))))
- (stop #~(if (defined? 'make-inetd-destructor)
- (make-inetd-destructor)
- (make-kill-destructor))))))))))
+ (list (shepherd-service
+ (provision '(bitlbee))
+
+ ;; Note: If networking is not up, then /etc/resolv.conf
+ ;; doesn't get mapped in the container, hence the dependency
+ ;; on 'networking'.
+ (requirement '(user-processes networking))
+
+ (start #~(if (defined? 'make-inetd-constructor)
+
+ (make-inetd-constructor
+ (list #$bitlbee* "-I" "-c" #$conf)
+ (list (endpoint
+ (addrinfo:addr
+ (car (getaddrinfo #$interface
+ #$(number->string port)
+ (logior AI_NUMERICHOST
+
AI_NUMERICSERV))))))
+ #:requirements '#$requirement
+ #:service-name-stem "bitlbee"
+ #:user "bitlbee" #:group "bitlbee"
+
+ ;; Allow 'bitlbee-purple' to use libpurple plugins.
+ #:environment-variables
+ (list (string-append "PURPLE_PLUGIN_PATH="
+ #$plugins "/lib/purple-2")
+ "GUIX_LOCPATH=/run/current-system/locale"))
+
+ (make-forkexec-constructor
+ (list #$(file-append bitlbee "/sbin/bitlbee")
+ "-n" "-F" "-u" "bitlbee" "-c" #$conf)
+
+ ;; Allow 'bitlbee-purple' to use libpurple plugins.
+ #:environment-variables
+ (list (string-append "PURPLE_PLUGIN_PATH="
+ #$plugins "/lib/purple-2"))
+
+ #:pid-file "/var/run/bitlbee.pid")))
+ (stop #~(if (defined? 'make-inetd-destructor)
+ (make-inetd-destructor)
+ (make-kill-destructor)))))))))
(define %bitlbee-accounts
;; User group and account to run BitlBee.
- branch master updated (4771960e5d -> ca81317389), guix-commits, 2023/12/21
- 02/12: gexp: #:references-graphs accepts and honors <gexp-input> records., guix-commits, 2023/12/21
- 11/12: services: Remove unnecessary references to (gnu build shepherd)., guix-commits, 2023/12/21
- 07/12: tests: jami: Check status of Jami D-Bus session., guix-commits, 2023/12/21
- 06/12: least-authority: Add support for changing UIDs/GIDs before exec., guix-commits, 2023/12/21
- 05/12: services: bitlbee: Remove use of ‘make-forkexec-constructor/container’.,
guix-commits <=
- 01/12: gexp: Add compiler for <gexp-input>., guix-commits, 2023/12/21
- 10/12: services: jami: Use ‘least-authority-wrapper’., guix-commits, 2023/12/21
- 12/12: shepherd: Remove ‘make-forkexec-constructor/container’., guix-commits, 2023/12/21
- 08/12: tests: jami: Double timeouts., guix-commits, 2023/12/21
- 03/12: services: pagekite: Use ‘least-authority-wrapper’., guix-commits, 2023/12/21
- 04/12: services: pagekite: Add ‘configuration’ action., guix-commits, 2023/12/21
- 09/12: services: jami-dbus-session: Use ‘least-authority-wrapper’., guix-commits, 2023/12/21