futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

services: bitlbee: Use ‘make-inetd-constructor’ unconditionally.

Browse Source 
This construct was introduced in Shepherd 0.9.0.

* gnu/services/messaging.scm (bitlbee-shepherd-service): Use
‘make-inetd-constructor’ unconditionally.

Change-Id: Id1b79077d60609c7f95439ee0d097dfe6e66dd2e
This commit is contained in:
Ludovic Courtès 2024-01-05 11:10:03 +01:00
parent 1964531ce5
commit 3eac1c82f7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gnu/services/messaging.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; 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> ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -857,39 +857,24 @@ string, you could instantiate a prosody service like this:
;; on 'networking'. ;; on 'networking'.
(requirement '(user-processes networking)) (requirement '(user-processes networking))
(start #~(if (defined? 'make-inetd-constructor) (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"
(make-inetd-constructor ;; Allow 'bitlbee-purple' to use libpurple plugins.
(list #$bitlbee* "-I" "-c" #$conf) #:environment-variables
(list (endpoint (list (string-append "PURPLE_PLUGIN_PATH="
(addrinfo:addr #$plugins "/lib/purple-2")
(car (getaddrinfo #$interface "GUIX_LOCPATH=/run/current-system/locale")))
#$(number->string port) (stop #~(make-inetd-destructor))))))))
(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 (define %bitlbee-accounts
;; User group and account to run BitlBee. ;; User group and account to run BitlBee.