[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/07: services: bitlbee: Use ‘make-inetd-constructor’ unconditionally.
From: |
guix-commits |
Subject: |
07/07: services: bitlbee: Use ‘make-inetd-constructor’ unconditionally. |
Date: |
Mon, 8 Jan 2024 18:52:29 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 3eac1c82f7f1547aa6819db867b071a4ee7de8e3
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jan 5 11:10:03 2024 +0100
services: bitlbee: Use ‘make-inetd-constructor’ unconditionally.
This construct was introduced in Shepherd 0.9.0.
* gnu/services/messaging.scm (bitlbee-shepherd-service): Use
‘make-inetd-constructor’ unconditionally.
Change-Id: Id1b79077d60609c7f95439ee0d097dfe6e66dd2e
---
gnu/services/messaging.scm | 53 +++++++++++++++++-----------------------------
1 file changed, 19 insertions(+), 34 deletions(-)
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 7505810e7c..9702170b3e 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2015, 2017-2020, 2022, 2023 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2017-2020, 2022-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;;
;;; This file is part of GNU Guix.
@@ -857,39 +857,24 @@ string, you could instantiate a prosody service like this:
;; 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)))))))))
+ (start #~(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")))
+ (stop #~(make-inetd-destructor))))))))
(define %bitlbee-accounts
;; User group and account to run BitlBee.
- branch master updated (519e1e3eb8 -> 3eac1c82f7), guix-commits, 2024/01/08
- 04/07: system: hurd: Use the Shepherd 0.10.x., guix-commits, 2024/01/08
- 05/07: services: shepherd: Use the 0.10.x GOOPS-less interface., guix-commits, 2024/01/08
- 01/07: gnu: guile-fibers: Apply upstream patch fixing libevent timers., guix-commits, 2024/01/08
- 03/07: tests: childhurd: Increase SSH connection timeout., guix-commits, 2024/01/08
- 06/07: home: services: shepherd: Use the 0.10.x interface., guix-commits, 2024/01/08
- 07/07: services: bitlbee: Use ‘make-inetd-constructor’ unconditionally.,
guix-commits <=
- 02/07: services: openssh: Add dependency on ‘networking’., guix-commits, 2024/01/08