ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: bitlbee: Use 'make-inetd-constructor'.

Browse source 
* gnu/services/messaging.scm (bitlbee-shepherd-service): Add call to
'least-authority-wrapper'.  In 'start' method, use
'make-inetd-constructor' when available.
* gnu/tests/messaging.scm (run-bitlbee-test)["valid PID"]: Remove test.
This commit is contained in:
Ludovic Courtès 2022-04-16 19:17:57 +02:00
parent fd57ce267c
commit 211fe3f66e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 46 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
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, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2017-2020, 2022 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.
@ -28,11 +28,14 @@ (define-module (gnu services messaging)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu services configuration) #:use-module (gnu services configuration)
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
#:autoload (gnu build linux-container) (%namespaces)
#:use-module ((gnu system file-systems) #:select (file-system-mapping))
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix modules) #:use-module (guix modules)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix deprecation) #:use-module (guix deprecation)
#:use-module (guix least-authority)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-35) #:use-module (srfi srfi-35)
#:use-module (ice-9 match) #:use-module (ice-9 match)
@ -821,7 +824,18 @@ (define bitlbee-shepherd-service
DaemonInterface = " interface " DaemonInterface = " interface "
DaemonPort = " (number->string port) " DaemonPort = " (number->string port) "
PluginDir = " plugins "/lib/bitlbee PluginDir = " plugins "/lib/bitlbee
" extra-settings))) " extra-settings))
(bitlbee* (least-authority-wrapper
(file-append bitlbee "/sbin/bitlbee")
#:name "bitlbee"
#:mappings (list (file-system-mapping
(source "/var/lib/bitlbee")
(target source)
(writable? #t))
(file-system-mapping
(source conf)
(target conf)))
#:namespaces (delq 'net %namespaces))))
(with-imported-modules (source-module-closure (with-imported-modules (source-module-closure
'((gnu build shepherd) '((gnu build shepherd)
@ -836,20 +850,37 @@ (define bitlbee-shepherd-service
(modules '((gnu build shepherd) (modules '((gnu build shepherd)
(gnu system file-systems))) (gnu system file-systems)))
(start #~(make-forkexec-constructor/container (start #~(if (defined? 'make-inetd-constructor)
(list #$(file-append bitlbee "/sbin/bitlbee")
"-n" "-F" "-u" "bitlbee" "-c" #$conf)
;; Allow 'bitlbee-purple' to use libpurple plugins. (make-inetd-constructor
#:environment-variables (list #$bitlbee* "-I"
(list (string-append "PURPLE_PLUGIN_PATH=" "-u" "bitlbee" "-c" #$conf)
#$plugins "/lib/purple-2")) (addrinfo:addr
(car (getaddrinfo #$interface
#$(number->string port)
(logior AI_NUMERICHOST
AI_NUMERICSERV))))
#:service-name-stem "bitlbee"
#:pid-file "/var/run/bitlbee.pid" ;; Allow 'bitlbee-purple' to use libpurple plugins.
#:mappings (list (file-system-mapping #:environment-variables
(source "/var/lib/bitlbee") (list (string-append "PURPLE_PLUGIN_PATH="
(target source) #$plugins "/lib/purple-2")))
(writable? #t)))))
(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 #~(make-kill-destructor))))))))) (stop #~(make-kill-destructor)))))))))
(define %bitlbee-accounts (define %bitlbee-accounts

21
gnu/tests/messaging.scm
View file

@ -1,6 +1,6 @@
;;; 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, 2018, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017-2018, 2021-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -198,25 +198,6 @@ (define marionette
(start-service 'bitlbee)) (start-service 'bitlbee))
marionette)) marionette))
(test-equal "valid PID"
#$(file-append bitlbee "/sbin/bitlbee")
(marionette-eval
'(begin
(use-modules (srfi srfi-1)
(gnu services herd))
(let ((bitlbee
(find (lambda (service)
(equal? '(bitlbee)
(live-service-provision service)))
(current-services))))
(and (pk 'bitlbee-service bitlbee)
(let ((pid (live-service-running bitlbee)))
(readlink (string-append "/proc/"
(number->string pid)
"/exe"))))))
marionette))
(test-assert "connect" (test-assert "connect"
(let* ((address (make-socket-address AF_INET INADDR_LOOPBACK (let* ((address (make-socket-address AF_INET INADDR_LOOPBACK
6667)) 6667))