From ac95609208c0afe55d68bf42993ccb9b58ad44ce Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Sun, 23 May 2021 13:14:44 +0200 Subject: gnu: services: Add missing wireguard related exports. * gnu/services/vpn.scm: Export 'wireguard-peer-public-key' and 'wireguard-peer-keep-alive'. Signed-off-by: Guillaume Le Vaillant --- gnu/services/vpn.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/services') diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index 6fbe20a849..2bcbf76727 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2021 Solene Rapenne ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,6 +49,8 @@ wireguard-peer-name wireguard-peer-endpoint wireguard-peer-allowed-ips + wireguard-peer-public-key + wireguard-peer-keep-alive wireguard-configuration wireguard-configuration? @@ -526,7 +529,6 @@ is truncated and rewritten every minute.") (openvpn-remote-configuration ,openvpn-remote-configuration-fields)) 'openvpn-client-configuration)) - ;;; ;;; Wireguard. ;;; -- cgit 1.4.1 From 62a8d487d61513d214b9aa72e7efaefde215cd9b Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Wed, 27 May 2020 18:07:14 +0200 Subject: services: hostapd: Use package from configuration. * gnu/services/networking.scm (hostapd-shepherd-services): Replace 'hostapd' by the package specified in the configuration. --- gnu/services/networking.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/services') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index b78c8ceacc..87b3d754a3 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1591,7 +1591,8 @@ extra-settings "\n")))) (requirement `(user-processes ,@requirement)) (documentation "Run the hostapd WiFi access point daemon.") (start #~(make-forkexec-constructor - (list #$(file-append hostapd "/sbin/hostapd") + (list #$(file-append (hostapd-configuration-package config) + "/sbin/hostapd") #$(hostapd-configuration-file config)) #:log-file "/var/log/hostapd.log")) (stop #~(make-kill-destructor))))) -- cgit 1.4.1 From ea55e1355bb3d45d5f04e7cb390d2c6afa8e68e6 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 4 Jun 2020 16:14:01 +0200 Subject: services: dnsmasq: Extend 'activation-service'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/dns.scm (dnsmasq-activation): New procedure … (dnsmasq-service-type): … use it. --- gnu/services/dns.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/services') diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 55211cb08f..aeb2bfdc86 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -861,12 +861,20 @@ cache.size = 100 * MB #:pid-file "/run/dnsmasq.pid")) (stop #~(make-kill-destructor)))))) +(define (dnsmasq-activation config) + #~(begin + (use-modules (guix build utils)) + ;; create directory to store dnsmasq lease file + (mkdir-p "/var/lib/misc"))) + (define dnsmasq-service-type (service-type (name 'dnsmasq) (extensions (list (service-extension shepherd-root-service-type - (compose list dnsmasq-shepherd-service)))) + (compose list dnsmasq-shepherd-service)) + (service-extension activation-service-type + dnsmasq-activation))) (default-value (dnsmasq-configuration)) (description "Run the dnsmasq DNS server."))) -- cgit 1.4.1 From ec9307ea079fa6b25c51f7fde3114f1d9183f497 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 1 Jun 2021 21:33:16 +0200 Subject: services: cuirass: Create the profile and GC root directory. * gnu/services/cuirass.scm (cuirass-activation): Create /var/guix/profiles/per-user/cuirass/cuirass or similar. --- gnu/services/cuirass.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/services') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 5b4e24d794..2daf3082df 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Mathieu Lirzin -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2017, 2020 Mathieu Othacehe ;;; Copyright © 2017 Jan Nieuwenhuizen ;;; Copyright © 2018, 2019 Ricardo Wurmus @@ -272,6 +272,8 @@ remote-server))) (user (cuirass-configuration-user config)) (log "/var/log/cuirass") + (profile (string-append "/var/guix/profiles/per-user/" user)) + (roots (string-append profile "/cuirass")) (group (cuirass-configuration-group config))) (with-imported-modules '((guix build utils)) #~(begin @@ -279,6 +281,7 @@ (mkdir-p #$cache) (mkdir-p #$log) + (mkdir-p #$roots) (when #$remote-cache (mkdir-p #$remote-cache)) @@ -287,6 +290,8 @@ (gid (group:gid (getgr #$group)))) (chown #$cache uid gid) (chown #$log uid gid) + (chown #$roots uid gid) + (chown #$profile uid gid) (when #$remote-cache (chown #$remote-cache uid gid))))))) -- cgit 1.4.1 From 0db906c52ca329adfbafd6677a7045232e5fdd48 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 1 Jun 2021 21:36:15 +0200 Subject: services: cuirass: Do not export record type descriptors. * gnu/services/cuirass.scm () (, ): Do not export. --- gnu/services/cuirass.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/services') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 2daf3082df..99b137e05e 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -38,16 +38,13 @@ #:use-module (gnu system shadow) #:use-module (srfi srfi-1) #:use-module (ice-9 match) - #:export ( - cuirass-remote-server-configuration + #:export (cuirass-remote-server-configuration cuirass-remote-server-configuration? - cuirass-configuration cuirass-configuration? cuirass-service-type - cuirass-remote-worker-configuration cuirass-remote-worker-configuration? cuirass-remote-worker-service-type)) -- cgit 1.4.1