From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 25 04:48:48 2022 Received: (at submit) by debbugs.gnu.org; 25 Mar 2022 08:48:48 +0000 Received: from localhost ([127.0.0.1]:50056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfcm-0000Ii-M9 for submit@debbugs.gnu.org; Fri, 25 Mar 2022 04:48:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:53668) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfcl-0000Ib-1z for submit@debbugs.gnu.org; Fri, 25 Mar 2022 04:48:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXfck-0002uG-R5 for guix-patches@gnu.org; Fri, 25 Mar 2022 04:48:46 -0400 Received: from smtprelay03.ispgateway.de ([80.67.18.15]:22717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXfcj-0006ev-9E for guix-patches@gnu.org; Fri, 25 Mar 2022 04:48:46 -0400 Received: from [93.195.170.97] (helo=milk) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nXfcg-0008Tf-18; Fri, 25 Mar 2022 09:48:42 +0100 From: Simon Streit To: guix-patches@gnu.org Subject: [PATCH 0/4] Add service declarations for Samba Gcc: nnfolder+archive:sent.2022-03 Date: Fri, 25 Mar 2022 09:48:38 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn Received-SPF: none client-ip=80.67.18.15; envelope-from=simon@netpanic.org; helo=smtprelay03.ispgateway.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! Please find attached several patches to add Samba and wsdd as service declaration for Guix. My Samba service declaration has been cut down in length since I am preparing a serialiser, which has not been finalised yet. But I'd rather still have these patch posted here to see it pushed eventually. Or others can test it to see if there are any other improvements that should be done and in case I've missed something. Though the service definition is rather simple for now. Kind regards Simon Streit (4): services: Add samba service. doc: Add "Samba" chapter. doc: Add documentation for WSDD service. services: Add wsdd service. doc/guix.texi | 119 ++++++++++++++++++ gnu/services/samba.scm | 280 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 399 insertions(+) create mode 100644 gnu/services/samba.scm -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 25 05:00:31 2022 Received: (at 54561) by debbugs.gnu.org; 25 Mar 2022 09:00:31 +0000 Received: from localhost ([127.0.0.1]:50090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfo6-0000cv-RO for submit@debbugs.gnu.org; Fri, 25 Mar 2022 05:00:31 -0400 Received: from smtprelay04.ispgateway.de ([80.67.18.16]:40613) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfo5-0000cn-8r for 54561@debbugs.gnu.org; Fri, 25 Mar 2022 05:00:30 -0400 Received: from [93.195.170.97] (helo=milk) by smtprelay04.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nXfoF-0005RL-F5 for 54561@debbugs.gnu.org; Fri, 25 Mar 2022 10:00:39 +0100 From: Simon Streit To: 54561@debbugs.gnu.org Subject: [PATCH 1/4] services: Add samba service. Gcc: nnfolder+archive:sent.2022-03 Date: Fri, 25 Mar 2022 10:00:26 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/samba.scm (): New record. (samba-service-type): New variable. (samba-shepherd-services): New Procedure. --- gnu/services/samba.scm | 173 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 gnu/services/samba.scm diff --git a/gnu/services/samba.scm b/gnu/services/samba.scm new file mode 100644 index 0000000000..ffbf20fdbc --- /dev/null +++ b/gnu/services/samba.scm @@ -0,0 +1,173 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2022 Simon Streit +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services samba) + + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages admin) + #:use-module (gnu packages samba) + + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu services shepherd) + #:use-module (gnu services base) + #:use-module (gnu system shadow) + + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix modules) + #:use-module (guix records) + + #:use-module (ice-9 format) + #:use-module (ice-9 match) + #:use-module (ice-9 textual-ports) + #:use-module (srfi srfi-1) + + #:export (samba-service-type + samba-configuration + samba-smb-conf + + wsdd-service-type + wsdd-configuration)) + +(define %smb-conf + (plain-file "smb.conf" "[global] + workgroup =3D WORKGROUP + server string =3D Samba Server + server role =3D standalone server + log file =3D /var/log/samba/log.%m + logging =3D file +")) + +(define-record-type* + samba-configuration + make-samba-configuration + samba-configuration? + (package samba-configuration-package + (default samba)) + (config-file samba-configuration-config-file + (default #f)) + (enable-samba? samba-configuration-enable-samba? + (default #f)) + (enable-smbd? samba-configuration-enable-smbd? + (default #t)) + (enable-nmbd? samba-configuration-enable-nmbd? + (default #t)) + (enable-winbindd? samba-configuration-enable-winbindd? + (default #t))) + +(define (samba-activation config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (with-imported-modules '((guix build utils)) + (let ((lib-directory "/var/lib/samba") + (log-directory "/var/log/samba") + (run-directory "/var/run/samba") + (smb.conf "/etc/samba/smb.conf")) + #~(begin + (use-modules (guix build utils)) + + (mkdir-p #$log-directory) + (mkdir-p #$run-directory) + (mkdir-p (string-append #$lib-directory "/private")) + (mkdir-p "/etc/samba") + (copy-file #$config-file #$smb.conf) + (system* (string-append #$package "/bin/testparm") + "--suppress-prompt" #$smb.conf)))))) + +(define (samba-samba-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run Samba") + (provision '(samba-samba)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/samba") + (string-append "--configfile=3D" #$config-fi= le) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-nmbd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run NMBD") + (provision '(samba-nmbd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/nmbd") + (string-append "--configfile=3D" #$config-fi= le) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-smbd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run SMBD") + (provision '(samba-smbd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/smbd") + (string-append "--configfile=3D" #$config-fi= le) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-winbindd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run Winnbindd for Name Service Switch") + (provision '(samba-winbindd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/winbindd") + (string-append "--configfile=3D" #$config-fi= le) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-shepherd-services config) + (append (if (samba-configuration-enable-samba? config) + (samba-samba-shepherd-service config) + '()) + (if (samba-configuration-enable-nmbd? config) + (samba-nmbd-shepherd-service config) + '()) + (if (samba-configuration-enable-smbd? config) + (samba-smbd-shepherd-service config) + '()) + (if (samba-configuration-enable-winbindd? config) + (samba-winbindd-shepherd-service config) + '()))) + +(define samba-service-type + (service-type + (name 'samba) + (description "Samba") + (extensions + (list (service-extension shepherd-root-service-type + samba-shepherd-services) + (service-extension activation-service-type + samba-activation))) + (default-value (samba-configuration)))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 25 05:01:54 2022 Received: (at 54561) by debbugs.gnu.org; 25 Mar 2022 09:01:55 +0000 Received: from localhost ([127.0.0.1]:50094 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfpS-0000f5-Hj for submit@debbugs.gnu.org; Fri, 25 Mar 2022 05:01:54 -0400 Received: from smtprelay03.ispgateway.de ([80.67.31.26]:44828) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfpQ-0000ev-CB for 54561@debbugs.gnu.org; Fri, 25 Mar 2022 05:01:53 -0400 Received: from [93.195.170.97] (helo=milk) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nXfpR-0001pv-Ga; Fri, 25 Mar 2022 10:01:53 +0100 From: Simon Streit To: 54561@debbugs.gnu.org Subject: [PATCH 2/4] doc: Add "Samba" chapter. Gcc: nnfolder+archive:sent.2022-03 Date: Fri, 25 Mar 2022 10:01:50 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- doc/guix.texi | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index e8ef4286be..270f07d068 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -101,6 +101,7 @@ Copyright @copyright{} 2021 Andrew Tropin@* Copyright @copyright{} 2021 Sarah Morgensen@* Copyright @copyright{} 2021 Josselin Poiret@* Copyright @copyright{} 2022 Remco van 't Veer@* +Copyright @copyright{} 2022 Simon Streit@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -368,6 +369,7 @@ Services * DNS Services:: DNS daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. +* Samba Services:: Samba services. * Continuous Integration:: Cuirass and Laminar services. * Power Management Services:: Extending battery life. * Audio Services:: The MPD. @@ -29861,6 +29863,57 @@ The verbosity level of the daemon. @end table @end deftp +@node Samba Services, Continuous Integration, Network File System, Services +@subsection Samba Services + +@cindex samba +@cindex smb +The @code{(gnu services samba)} module provides Guix service definitions +for Samba as well as additional helper services. Currently it provides +the following services: + +@subsubheading Samba + +Samba provides network shares for folder and printers, it can also be an +AD DC for other samba hosts in an heterougenious network with different +types of Computer systems. + +@defvar{samba-service-type} + +The service type to enable the samba services @code{samba}, @code{nmbd}, +@code{smbd} and @code{winbindd}. By default this service type does not +run as an AD DC, hence @code{samba} remains disabled. It is recommended +that Samba's package is added to the system profile to have the tool-set +available for modifications in Samba's runtime directories. + +@end defvar + +@deftp{Data Type} samba-service-configuration +Configuration record for the Samba suite. + +@table @asis +@item @code{package} (default: @code{samba}) +The samba package to use. + +@item @code{config-file} (default: @code{#f}) +The config file to use. Please note: Setting this variable will disable +all config options that come after @code{enable-winbindd?}. + +@item @code{enable-samba?} (default: @code{#f}) +Manually enable the @code{samba} daemon. + +@item @code{enable-smbd?} (default: @code{#f}) +Manually enable the @code{smbd} daemon. + +@item @code{enable-nmbd?} (default: @code{#f}) +Manually enable the @code{nmbd} daemon. + +@item @code{enable-winbindd?} (default: @code{#f}) +Manually enable the @code{winbindd} daemon. + +@end table +@end deftp + @node Continuous Integration @subsection Continuous Integration -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 25 05:02:56 2022 Received: (at 54561) by debbugs.gnu.org; 25 Mar 2022 09:02:56 +0000 Received: from localhost ([127.0.0.1]:50098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfqR-0000gh-Vr for submit@debbugs.gnu.org; Fri, 25 Mar 2022 05:02:56 -0400 Received: from smtprelay04.ispgateway.de ([80.67.31.32]:15569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfqQ-0000ga-I4 for 54561@debbugs.gnu.org; Fri, 25 Mar 2022 05:02:55 -0400 Received: from [93.195.170.97] (helo=milk) by smtprelay04.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nXfqb-0007RG-Ky; Fri, 25 Mar 2022 10:03:05 +0100 From: Simon Streit To: 54561@debbugs.gnu.org Subject: [PATCH 3/4] doc: Add documentation for WSDD service. Date: Thu, 24 Mar 2022 22:10:05 +0100 Gcc: nnfolder+archive:sent.2022-03 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- doc/guix.texi | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 270f07d068..9770856050 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -29914,6 +29914,72 @@ Manually enable the @code{winbindd} daemon. @end table @ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) --- doc/guix.texi | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 270f07d068..9770856050 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -29914,6 +29914,72 @@ Manually enable the @code{winbindd} daemon. @end table @end deftp +@cindex wsdd +@subsubheading Web Service Discovery Daemon + +Web Service Discovery Daemon implements the WSD protocoll. It is a +drop-in replacement for host discovery that lack support for the SMBv1 +protocol. + +@defvr{Scheme Variable} wsdd-service-type + +Service type for the Web Service Discoery host daemon. The value for +this service type is a @code{wsdd-configuration} record. The details +for the @code{wsdd-configuration} record type are given below. +@end defvr + +@deftp{Data Type} wsdd-configuration This data type represents the +configuration for the wsdd service. + +@table @asis + +@item @code{package} (default: @code{wsdd}) +The wsdd package to use. + +@item @code{ipv4only?} (default: @code{#f}) +Only listen to ipv4 addresses. + +@item @code{ipv6only} (default: @code{#f}) +Only listen to ipv6 addresses. Please note: Activating both options is +not possible, since there would be no ip versions to listen to. + +@item @code{chroot} (default: @code{#f}) +Chroot into a sperate directory to prevent access to other directories. +This is to increase security in case there is a vulnerability in +@command{wsdd}. + +@item @code{hoplimit} (default: @code{1}) +Limit to the level of hops for multicast packets. The default is +@var{1} which should prevent packets from leaving the local network. + +@item @code{interface} (default: @code{'()}) +Limit to the given list of interfaces to listen to. By default wsdd +will listen to all interfaces. Except the loopback interface is never +used. + +@item @code{uuid-device} (default: @code{#f}) +The WSD protocol requires a device to have a UUID. Set this to manually +assign the service a UUID. + +@item @code{domain} (default: @code{#f}) +Notify this host is a member of an Active Directory. + +@item @code{hostname} (default: @code{#f}) +Manually set the hostname rather than letting @command{wsdd} inherit +this host's hostname. + +@item @code{preserve-case?} (default: @code{#f}) +By default @command{wsdd} will convert the hostname in workgroup to all +uppercase. The opposite is true for hostnames in domains. Setting this +parameter will preserve case. + +@item @code{workgroup} (default: @var{"WORKGROUP"}) +Change the name of the workgroup. By default @command{wsdd} reports +this host being member of a workgroup. + +@end table +@end deftp + @node Continuous Integration @subsection Continuous Integration -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 25 05:03:41 2022 Received: (at 54561) by debbugs.gnu.org; 25 Mar 2022 09:03:41 +0000 Received: from localhost ([127.0.0.1]:50102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfrB-0000i6-Ah for submit@debbugs.gnu.org; Fri, 25 Mar 2022 05:03:41 -0400 Received: from smtprelay07.ispgateway.de ([134.119.228.101]:51461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXfr9-0000hy-SM for 54561@debbugs.gnu.org; Fri, 25 Mar 2022 05:03:40 -0400 Received: from [93.195.170.97] (helo=milk) by smtprelay07.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nXfr9-0001ii-8P; Fri, 25 Mar 2022 10:03:39 +0100 From: Simon Streit To: 54561@debbugs.gnu.org Subject: [PATCH 4/4] services: Add wsdd service. Date: Thu, 24 Mar 2022 22:14:05 +0100 Gcc: nnfolder+archive:sent.2022-03 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/services/samba.scm (): New record. (wsdd-service-type): New variable. (wsdd-shepherd-services): New procedure. --- gnu/services/samba.scm | 107 ++++++++++++++++++++++++++++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [134.119.228.101 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * gnu/services/samba.scm (): New record. (wsdd-service-type): New variable. (wsdd-shepherd-services): New procedure. --- gnu/services/samba.scm | 107 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/gnu/services/samba.scm b/gnu/services/samba.scm index ffbf20fdbc..3058ed9d47 100644 --- a/gnu/services/samba.scm +++ b/gnu/services/samba.scm @@ -171,3 +171,110 @@ (define samba-service-type (service-extension activation-service-type samba-activation))) (default-value (samba-configuration)))) + + +;;; +;;; WSDD +;;; + +(define-record-type* + wsdd-configuration + make-wsdd-configuration + wsdd-configuration? + (package wsdd-configuration-package + (default wsdd)) + (ipv4only? wsdd-configuration-ipv4only? + (default #f)) + (ipv6only? wsdd-configuration-ipv6only? + (default #f)) + (chroot wsdd-configuration-chroot + (default #f)) + (hoplimit wsdd-configuration-hoplimit + (default 1)) + (interfaces wsdd-configuration-interfaces + (default '())) + (uuid-device wsdd-configuration-uuid-device + (default #f)) + (domain wsdd-configuration-domain + (default #f)) + (hostname wsdd-configuration-hostname + (default #f)) + (preserve-case? wsdd-configuration-preserve-case? + (default #f)) + (workgroup wsdd-configuration-workgroup + (default "WORKGROUP"))) + +(define wsdd-accounts + (list + (user-group (name "wsdd")) + (user-account (name "wsdd") + (group "wsdd") + (comment "Web Service Discovery user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))) + +(define wsdd-shepherd-service + (match-lambda + (($ package + ipv4only? + ipv6only? + chroot + hoplimit + interfaces + uuid-device + domain + hostname + preserve-case? + workgroup + ) + (list (shepherd-service + (documentation "Run a Web Service Discovery service") + (provision '(wsdd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/bin/wsdd") + #$@(if ipv4only? + #~("--ipv4only") + '()) + #$@(if ipv6only? + #~("--ipv6only") + '()) + #$@(if chroot + #~("--chroot" #$chroot) + '()) + #$@(if hoplimit + #~("--hoplimit" #$(number->string hoplimit)) + '()) + #$@(map (lambda (interfaces) + (string-append "--interface=" interfaces)) + interfaces) + #$@(if uuid-device + #~("--uuid" #$uuid-device) + '()) + #$@(if domain + #~("--domain" #$domain) + '()) + #$@(if hostname + #~("--hostname" #$hostname) + '()) + #$@(if preserve-case? + #~("--preserve-case") + '()) + #$@(if workgroup + #~("--workgroup" #$workgroup) + '())) + #:user "wsdd" + #:group "wsdd" + #:log-file "/var/log/wsdd.log")) + (stop #~(make-kill-destructor))))))) + +(define wsdd-service-type + (service-type + (name 'wsdd) + (description "Web Service Discovery Daemon") + (extensions + (list (service-extension shepherd-root-service-type + wsdd-shepherd-service) + (service-extension account-service-type + (const wsdd-accounts)))) + (default-value (wsdd-configuration)))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 25 05:16:49 2022 Received: (at 54561) by debbugs.gnu.org; 25 Mar 2022 09:16:49 +0000 Received: from localhost ([127.0.0.1]:50112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXg3t-00011p-0Q for submit@debbugs.gnu.org; Fri, 25 Mar 2022 05:16:49 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.39]:55665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXg3s-00011g-AE for 54561@debbugs.gnu.org; Fri, 25 Mar 2022 05:16:48 -0400 Received: from [93.195.170.97] (helo=milk) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nXg4C-000600-37; Fri, 25 Mar 2022 10:17:08 +0100 From: Simon Streit To: 54561@debbugs.gnu.org Subject: Re: [PATCH 4/4] services: Add wsdd service. References: Gcc: nnfolder+archive:sent.2022-03 Date: Fri, 25 Mar 2022 10:16:45 +0100 In-Reply-To: (Simon Streit's message of "Thu, 24 Mar 2022 22:14:05 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Oh, I just realised I forgot to add a patch for wsdd's package. From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 25 08:02:46 2022 Received: (at 54561) by debbugs.gnu.org; 25 Mar 2022 12:02:46 +0000 Received: from localhost ([127.0.0.1]:50394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXieU-0007sC-0q for submit@debbugs.gnu.org; Fri, 25 Mar 2022 08:02:46 -0400 Received: from smtprelay05.ispgateway.de ([80.67.31.99]:55887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXieS-0007s4-FH for 54561@debbugs.gnu.org; Fri, 25 Mar 2022 08:02:44 -0400 Received: from [93.195.170.97] (helo=motorball) by smtprelay05.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nXieY-0001wB-Mj; Fri, 25 Mar 2022 13:02:50 +0100 From: Simon Streit To: 54561@debbugs.gnu.org Subject: Re: [bug#54561] [PATCH 4/4] services: Add wsdd service. References: Gcc: nnfolder+archive:sent.2022-03 Date: Fri, 25 Mar 2022 13:02:42 +0100 In-Reply-To: (Simon Streit's message of "Fri, 25 Mar 2022 10:16:45 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Done. Patch can be found here: https://issues.guix.gnu.org/54563 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 25 11:14:36 2022 Received: (at 54561) by debbugs.gnu.org; 25 Mar 2022 15:14:37 +0000 Received: from localhost ([127.0.0.1]:52177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXle8-0000hu-OX for submit@debbugs.gnu.org; Fri, 25 Mar 2022 11:14:36 -0400 Received: from smtprelay04.ispgateway.de ([80.67.31.42]:49972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nXle7-0000hl-A8 for 54561@debbugs.gnu.org; Fri, 25 Mar 2022 11:14:36 -0400 Received: from [93.195.169.185] (helo=motorball.wh6.home.arpa) by smtprelay04.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1nXleH-0007ve-Ft; Fri, 25 Mar 2022 16:14:45 +0100 From: Simon Streit To: 54561@debbugs.gnu.org Subject: [PATCH] gnu: samba: Modify input list. Date: Fri, 25 Mar 2022 16:14:13 +0100 Message-Id: <7eba2a7e1a8edbfe6aa40b24039370cb8013e460.1648212678.git.simon@netpanic.org> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I'd like to propose to have avahi added to the input list in samba. With it Unix based clients will find Samba hosts in local networks. SMBv1 host discovery in Samba has been disabled. Hence this modification. * gnu/packages/samba.scm (samba) : Add avahi. --- gnu/packages/samba.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 21a5fe8617..63d7245efe 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -254,7 +254,8 @@ (define-public samba python popt readline - tdb)) + tdb + avahi)) (propagated-inputs ;; In Requires or Requires.private of pkg-config files. (list ldb talloc tevent)) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 26 21:07:42 2022 Received: (at submit) by debbugs.gnu.org; 27 Mar 2022 01:07:43 +0000 Received: from localhost ([127.0.0.1]:54972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYHNe-0002J3-G5 for submit@debbugs.gnu.org; Sat, 26 Mar 2022 21:07:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:35194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYHNd-0002Iu-9y for submit@debbugs.gnu.org; Sat, 26 Mar 2022 21:07:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYHNd-0005qF-41 for guix-patches@gnu.org; Sat, 26 Mar 2022 21:07:41 -0400 Received: from [2a00:1450:4864:20::62a] (port=38439 helo=mail-ej1-x62a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYHNb-0003SR-0y for guix-patches@gnu.org; Sat, 26 Mar 2022 21:07:40 -0400 Received: by mail-ej1-x62a.google.com with SMTP id r13so22102663ejd.5 for ; Sat, 26 Mar 2022 18:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=3gFO+Oabr99bNkZ29lsG6HzBm7Q8pAQ/Pb1pHsAww3A=; b=SMu5IwikpFtLNWWYh06chvZ0/JjRXl2oAkdgaEyq92bA5HWc0bmCIamYb5sYh3qgfv qRRIRYM+22Y+9NVSv0V5S6GaJcK2z7xEnDqATvig9AMEgk+EACjAi/JdQ/FD4F4Jk7Pi M77VVY8m01g+NHVX+MPmxvjIU1LKMZqZuX8mS+pugmdu1GpMxnDUcJPLfLyiDtuqv/kf FybJ0oHPesDCF2Slz2SDJ4VxLYPrR9dGU2lk+8tl1HcVX0f9oa6F9i4uJx1WJOuWAHTM //qxXSACoU39bSPKOlXy65Awp7zp5ltsxfAdknyHEpfP6UBzpom2h/kMoj7y9HebzqeA pKOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=3gFO+Oabr99bNkZ29lsG6HzBm7Q8pAQ/Pb1pHsAww3A=; b=0jombSHwUvdwVrcabO0UAsOgXKGWQ/0ff5xIg8JJQShcjzkNMsy+puazlXG+mEguOQ XHSEGOZJsqOJtMF1oS9vf78mj6wozy6doW4Oixvcd8ZYcxFH7vsg6dvBUHSVk3gveTsZ eHNXsZBd6WgZEejbp5XsIevl1Bi7pTUfA6wiNZD2ZTLYo6h8Wm4cwvfGf1HNJpdg4g7C ptk2R9P7jwoAv1Gdut5KBcAdnCeeCNKbyvHzhOE+P274c/xvom9l1/Nze7K2d/e7YGBe SOPr/hJiX5EIIbI/BzgzP8u//glPwb70QvFu6ZYRl/lRzlxv06ymBTlb/SoAzDbV8eWM UwGg== X-Gm-Message-State: AOAM532laTYY5B/q0NstmHnvHfOVvq1A0s2+i+VN2mdY2v/dpr1UDiVH wv4IOLJpMhK8w4qtmZA9JVCqhCFn7q0= X-Google-Smtp-Source: ABdhPJx5Kw4kzseH0TTqHxBCPmX1H45oh1uQJ1oGA5cYvfBZezIR2rffsXchXf9qihLKm/xE/Q0RRg== X-Received: by 2002:a17:907:162a:b0:6db:b0e8:9721 with SMTP id hb42-20020a170907162a00b006dbb0e89721mr19585024ejc.579.1648343255204; Sat, 26 Mar 2022 18:07:35 -0700 (PDT) Received: from ?IPV6:2003:ee:af13:4e00:138c:330:2a14:b8fb? (p200300eeaf134e00138c03302a14b8fb.dip0.t-ipconnect.de. [2003:ee:af13:4e00:138c:330:2a14:b8fb]) by smtp.gmail.com with ESMTPSA id kb28-20020a1709070f9c00b006d5d8bf1b72sm3993787ejc.78.2022.03.26.18.07.34 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Mar 2022 18:07:34 -0700 (PDT) Message-ID: <2f1eb553-2d1d-2e83-1412-948011d502cc@gmail.com> Date: Sun, 27 Mar 2022 03:07:33 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [bug#54561] [PATCH 1/4] services: Add samba service. Content-Language: en-US To: guix-patches@gnu.org References: From: fesoj000 In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=fesoj000@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, NICE_REPLY_A=-0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) I have a local service definition for samba i wanted to upstream at some point. Your service looks better then mine though. > +(define (samba-activation config) > + (let ((package (samba-configuration-package config)) > + (config-file (samba-configuration-config-file config))) > + (with-imported-modules '((guix build utils)) > + (let ((lib-directory "/var/lib/samba") > + (log-directory "/var/log/samba") > + (run-directory "/var/run/samba") > + (smb.conf "/etc/samba/smb.conf")) > + #~(begin > + (use-modules (guix build utils)) > + > + (mkdir-p #$log-directory) > + (mkdir-p #$run-directory) > + (mkdir-p (string-append #$lib-directory "/private")) > + (mkdir-p "/etc/samba") > + (copy-file #$config-file #$smb.conf) > + (system* (string-append #$package "/bin/testparm") > + "--suppress-prompt" #$smb.conf)))))) Is it a good idea to create all those directories with the default umask? I always wanted to investigate which of those directories contains sensitive data. I never got around to. Another thing i wanted to investigate: can samba and friends be run as non-root users? I think it would be a good idea to do that if possible. fyi: I currently use samba as an AD DC. From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 26 21:07:46 2022 Received: (at submit) by debbugs.gnu.org; 27 Mar 2022 01:07:46 +0000 Received: from localhost ([127.0.0.1]:54974 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYHNh-0002JJ-US for submit@debbugs.gnu.org; Sat, 26 Mar 2022 21:07:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:35196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYHNe-0002J2-Du for submit@debbugs.gnu.org; Sat, 26 Mar 2022 21:07:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYHNd-0005qL-Pb for guix-patches@gnu.org; Sat, 26 Mar 2022 21:07:42 -0400 Received: from [2a00:1450:4864:20::52c] (port=41865 helo=mail-ed1-x52c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nYHNc-0003Tb-83 for guix-patches@gnu.org; Sat, 26 Mar 2022 21:07:41 -0400 Received: by mail-ed1-x52c.google.com with SMTP id x34so13205442ede.8 for ; Sat, 26 Mar 2022 18:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=VCOtUaeZx3GK4hMsOMsBZtt5+t50b0dOQ4CKzwGL6lk=; b=SssRFivqaJ6nvuXxFV7p7QwvXRKjWloxTBZLgwkCU7EopYOojl2N6+xnyo1QZlNhpP An24EiZkVsDBP5YgN6VpixOGpfNlY9fhpS2DrQIWZdcIgIbb58AzGBctrAxEgFXLIFU8 uYU8jn0yuT1d7ZpzZqpE4vFr0Wk2liHJyxUVg2BkG0qn+4mSMVhDiytoEzsfdlYmfW8K xwd/etSffcxjctoKGH95zxXdoItgwv7bC6AQgw3PSTBOA1y46VnCxgyvqahjYBikBnlu YE+wncNgNUOAWa4xHCyEeJ3N9VsL/ZzwPoEiuHLxEkdgpRfvSdCD0ft9HEzIqbp/yCfz Ws2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=VCOtUaeZx3GK4hMsOMsBZtt5+t50b0dOQ4CKzwGL6lk=; b=rlstyN6UZUxvHt/dmeaftqJxGoaCDmMOjrNFLRR9DaqsSLMEem2RPnzc9twP0gQ72X +nDgtQoXHUDfNawTcxa0RQyh9zVX0ywzta0OsaPlq98fNhVKVIAiGOhKTnX39F1h/KuH APs7PfigFW5qltd/K5MLBletW9+yUGvKUrSI2FHyaaokDpGYxfj5NBk0PanP6xn4vqok Zil7GekGGFwQldWKvZZ/USRoAQQYgl6BftL+vsMKi+q80gR+vaG3b1XbtjlJGZ6OV1Fv BQRdZKJa2T4KxN0yNhNFLjfTWiU6ygEeqvuZKdYsNvQYwTvUyH4Efz41dvUOAqhGATZo FBsw== X-Gm-Message-State: AOAM531L4A+AWx/oprvBw1HIx07nC4bAAPWiTkXOHzMdPTO6I4/N7XjJ tVb6OpiFQCo3kFQxyvbGd3kWSC18lF4= X-Google-Smtp-Source: ABdhPJxiUjIYKflaphnTO0hZp++eAfJu64JFwDDNQd2C1kyzzOXfPoFTf1QvvZuLvI78TOB/9rNLFA== X-Received: by 2002:a05:6402:23a8:b0:419:31c1:d141 with SMTP id j40-20020a05640223a800b0041931c1d141mr7756274eda.33.1648343258362; Sat, 26 Mar 2022 18:07:38 -0700 (PDT) Received: from ?IPV6:2003:ee:af13:4e00:138c:330:2a14:b8fb? (p200300eeaf134e00138c03302a14b8fb.dip0.t-ipconnect.de. [2003:ee:af13:4e00:138c:330:2a14:b8fb]) by smtp.gmail.com with ESMTPSA id w14-20020a170906d20e00b006cee22553f7sm4097104ejz.213.2022.03.26.18.07.37 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Mar 2022 18:07:38 -0700 (PDT) Message-ID: <761c10eb-01cd-e541-f238-919624897402@gmail.com> Date: Sun, 27 Mar 2022 03:07:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [bug#54561] [PATCH 2/4] doc: Add "Samba" chapter. Content-Language: en-US To: guix-patches@gnu.org References: From: fesoj000 In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::52c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=fesoj000@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, NICE_REPLY_A=-0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) > +@defvar{samba-service-type} > + > +The service type to enable the samba services @code{samba}, @code{nmbd}, > +@code{smbd} and @code{winbindd}. By default this service type does not > +run as an AD DC, hence @code{samba} remains disabled. It is recommended > +that Samba's package is added to the system profile to have the tool-set > +available for modifications in Samba's runtime directories. Maybe it is a good idea to provide the samba tool-set by default. You could add the following to your samba-service-type: (service-extension profile-service-type (compose list samba-configuration-samba)) Some of the samba tools are broken though. I send a patch some time ago which tries to address this issue. Maybe you want to take a look? https://issues.guix.gnu.org/issue/54266 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 27 10:13:49 2022 Received: (at 54561) by debbugs.gnu.org; 27 Mar 2022 14:13:49 +0000 Received: from localhost ([127.0.0.1]:56381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYTeP-0001kX-8H for submit@debbugs.gnu.org; Sun, 27 Mar 2022 10:13:49 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:55902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYTeO-0001kP-DE for 54561@debbugs.gnu.org; Sun, 27 Mar 2022 10:13:48 -0400 Received: from [172.20.10.23] ([188.188.29.207]) by andre.telenet-ops.be with bizsmtp id BSDn2700C4U7BGC01SDnNw; Sun, 27 Mar 2022 16:13:47 +0200 Message-ID: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> Subject: Re: [bug#54561] [PATCH 1/4] services: Add samba service. From: Maxime Devos To: fesoj000 , 54561@debbugs.gnu.org Date: Sun, 27 Mar 2022 16:13:46 +0200 In-Reply-To: <2f1eb553-2d1d-2e83-1412-948011d502cc@gmail.com> References: <2f1eb553-2d1d-2e83-1412-948011d502cc@gmail.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-NGft9JXTOSFDKnCnYMFp" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1648390427; bh=dAoY45a0SjXoJL3vkq+G5ty6xpo6wAav5Z9KRDReEwM=; h=Subject:From:To:Date:In-Reply-To:References; b=ExzOrHVG5xnocBmTHvMyfhhiNdTCTjQ/4ZJRHy74AmLZU/BNNuH6X7nz5LWhpLzok bQom2thLwaCRmyCg9cHXpafq/79DdcXUMrsxPgdhI13AViCLthqi7K2juj98s/EPjk nay7CjLbGX1CuMkqR9W3TOYmpSOnKerHE75IYrV86JMO96yx1BQapokOyzNaNNXYrY R/suMpZN1aSyaMeiMMvOsZWUPxxDtj9wc0/w32WmMM+WkfjTabcnbBoXvuvtCTZZ1B ekpfo7IgxfkuHYc5FqNaa1uCv5NDjAQ6Swtel6xIkY6rY+xeGOjY6Jjt5DlnMjdIiT CBigD/ldwuC1g== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-NGft9JXTOSFDKnCnYMFp Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 ZmVzb2owMDAgc2NocmVlZiBvcCB6byAyNy0wMy0yMDIyIG9tIDAzOjA3IFsrMDIwMF06Cj4gPiAr KGRlZmluZSAoc2FtYmEtYWN0aXZhdGlvbiBjb25maWcpCj4gPiArwqAgKGxldCAoKHBhY2thZ2Ug KHNhbWJhLWNvbmZpZ3VyYXRpb24tcGFja2FnZSBjb25maWcpKQo+ID4gK8KgwqDCoMKgwqDCoMKg IChjb25maWctZmlsZSAoc2FtYmEtY29uZmlndXJhdGlvbi1jb25maWctZmlsZSBjb25maWcpKSkK PiA+ICvCoMKgwqAgKHdpdGgtaW1wb3J0ZWQtbW9kdWxlcyAnKChndWl4IGJ1aWxkIHV0aWxzKSkK PiA+ICvCoMKgwqDCoMKgIChsZXQgKChsaWItZGlyZWN0b3J5ICIvdmFyL2xpYi9zYW1iYSIpCj4g PiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobG9nLWRpcmVjdG9yeSAiL3Zhci9sb2cvc2FtYmEi KQo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHJ1bi1kaXJlY3RvcnkgIi92YXIvcnVuL3Nh bWJhIikKPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzbWIuY29uZiAiL2V0Yy9zYW1iYS9z bWIuY29uZiIpKQoKSXMgaXQgbmVjZXNzYXJ5IHRvIHB1dCB0aGUgY29uZmlndXJhdGlvbiBmaWxl IHRoZXJlPwpDYW4gYmUgd2UgZG8gc29tZXRoaW5nIGxpa2UgKHN5c3RlbSogIi8uLi4vdGVzdHBh cm0iICMkc21iLmNvbmYpLCB3aGVyZQpzbWIuY29uZiBpcyB0aGUgZ2VuZXJhdGVkIGNvbmZpZ3Vy YXRpb24gZmlsZT8KCj4gPiArwqDCoMKgwqDCoMKgwqAgI34oYmVnaW4KPiA+ICvCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICh1c2UtbW9kdWxlcyAoZ3VpeCBidWlsZCB1dGlscykpCj4gPiArCj4gPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobWtkaXItcCAjJGxvZy1kaXJlY3RvcnkpCj4gPiArwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAobWtkaXItcCAjJHJ1bi1kaXJlY3RvcnkpCj4gPiArwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAobWtkaXItcCAoc3RyaW5nLWFwcGVuZCAjJGxpYi1kaXJlY3Rvcnkg Ii9wcml2YXRlIikpCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAobWtkaXItcCAiL2V0Yy9z YW1iYSIpCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoY29weS1maWxlICMkY29uZmlnLWZp bGUgIyRzbWIuY29uZikKPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzeXN0ZW0qIChzdHJp bmctYXBwZW5kICMkcGFja2FnZSAiL2Jpbi90ZXN0cGFybSIpCj4gPiArwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiLS1zdXBwcmVzcy1wcm9tcHQiICMkc21iLmNvbmYp KSkpKSkKPiBJcyBpdCBhIGdvb2QgaWRlYSB0byBjcmVhdGUgYWxsIHRob3NlIGRpcmVjdG9yaWVz IHdpdGggdGhlIGRlZmF1bHQKPiB1bWFzaz8gSSBhbHdheXMgd2FudGVkIHRvIGludmVzdGlnYXRl IHdoaWNoIG9mIHRob3NlIGRpcmVjdG9yaWVzCj4gY29udGFpbnMgc2Vuc2l0aXZlIGRhdGEuIEkg bmV2ZXIgZ290IGFyb3VuZCB0by4KCkZXSVcsIHlvdSBjYW4gdXNlICdta2Rpci1wL3Blcm1zJyB0 byBzZXQgdGhlIHBlcm1pc3Npb24gYml0cy4KVGhlIChzdHJpbmctYXBwZW5kIC4uLikgY2FuIGJl IHNpbXBsaWZpZWQgdG86CgogIChzeXN0ZW0qICMkKGZpbGUtYXBwZW5kIHBhY2thZ2UgIi9iaW4v dGVzdHBhcm0iICItLXN1cHByZXMtcHJvbXB0CiMkc21iLmNvbmYpLgoKQWxzbywgd291bGQgaXQg YmUgYSBnb29kIGlkZWEgdG8gdXNlIChpbnZva2UgLi4uKSBpbnN0ZWFkIG9mIHN5c3RlbSwgdG8K bWFrZSBzdXJlIGVycm9ycyBhcmUgZGV0ZWN0ZWQ/ICBXaGF0IGlzIHRoZSAnc3VwcHJlc3MtcHJv bXB0JyBmb3I/CgpHcmVldGluZ3MsCk1heGltZS4K --=-NGft9JXTOSFDKnCnYMFp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYkBxGhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7uwbAP45pl4YScbSU0FxSQG4JT0+IYyX Gn/ftPsBfLiaBojlRQEA5mB/9rcgK+W9yW7iPUucNr/LTDW6qeL0E0rXv8FnMgM= =SoYU -----END PGP SIGNATURE----- --=-NGft9JXTOSFDKnCnYMFp-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 27 10:15:28 2022 Received: (at 54561) by debbugs.gnu.org; 27 Mar 2022 14:15:28 +0000 Received: from localhost ([127.0.0.1]:56386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYTg0-0001nZ-KE for submit@debbugs.gnu.org; Sun, 27 Mar 2022 10:15:28 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:57988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYTfz-0001nR-5b for 54561@debbugs.gnu.org; Sun, 27 Mar 2022 10:15:27 -0400 Received: from [172.20.10.23] ([188.188.29.207]) by andre.telenet-ops.be with bizsmtp id BSFR270094U7BGC01SFRda; Sun, 27 Mar 2022 16:15:26 +0200 Message-ID: <37faa41273793a6fb276ef73399e1e3493be3656.camel@telenet.be> Subject: Re: [bug#54561] [PATCH 2/4] doc: Add "Samba" chapter. From: Maxime Devos To: Simon Streit , 54561@debbugs.gnu.org Date: Sun, 27 Mar 2022 16:15:25 +0200 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-AJhBAdClceoACYDsKKAr" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1648390526; bh=KdotRLxyL3V6j0l7XEMoU/AWTztX9ZN4OdbPvXGSxIY=; h=Subject:From:To:Date:In-Reply-To:References; b=RVn4p3ca1e/4Xc5U91OcTpoQlGxx+G+/I0kDb5UwSo6rioAK/SvgbHkhYhx+Ktrtj XyDzjeWJDYch2Ef1J9/4iuJwooLPOZgE+VvMHYnDgJD3tRY4sSkMBO531SnJk3cT3q fpg9J/FaTVrhCNcuNRzH1xRmmcxNCnF8BUEMfm74E+kd2l2Xk10dIhnGIuA1Us3MKd EPW9mAZJpXpzggUuEImJQxDH8rBwyiifdGSc1A7Bvo/UvzqlTM/rSJYgS412ymoRse cM12Zp0WNm03wLGJVbLVZmX1Tg/HlSv/mhUpnifv2l1LQKT2JmxPME0aZ3ZC7BhfP0 BZ9rAYDn9tanw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-AJhBAdClceoACYDsKKAr Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Simon Streit schreef op vr 25-03-2022 om 10:01 [+0100]: > +@item @code{config-file} (default: @code{#f}) > +The config file to use.=C2=A0 Please note: Setting this variable will di= sable > +all config options that come after @code{enable-winbindd?}. [...] > +@item @code{enable-winbindd?} (default: @code{#f}) > +Manually enable the @code{winbindd} daemon. > + > +@end table > +@end deftp I don't see any configuration option after enable-winbindd?. Also, what does =E2=80=98manually enable=E2=80=99 mean here? How can I determine= if this needs to be done? Can it be done automatically instead of manually? Greetings, Maxime. --=-AJhBAdClceoACYDsKKAr Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYkBxfRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7n9nAQC3OdBY2jaDVl3z36cCFmNHF96t zWyNwWMV8qYUmMom4AD/SJgn/SKsIzjTPmuvDge0oIC0A1ifDSU/HtqyuC0teAM= =rViN -----END PGP SIGNATURE----- --=-AJhBAdClceoACYDsKKAr-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 27 14:32:22 2022 Received: (at 54561) by debbugs.gnu.org; 27 Mar 2022 18:32:22 +0000 Received: from localhost ([127.0.0.1]:56525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYXgb-0008Cc-QD for submit@debbugs.gnu.org; Sun, 27 Mar 2022 14:32:22 -0400 Received: from smtprelay04.ispgateway.de ([80.67.31.38]:24679) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYXgZ-0008CS-BG for 54561@debbugs.gnu.org; Sun, 27 Mar 2022 14:32:20 -0400 Received: from [91.40.247.147] (helo=motorball) by smtprelay04.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nYXgm-0006K9-M8; Sun, 27 Mar 2022 20:32:32 +0200 From: Simon Streit To: Maxime Devos Subject: Re: [bug#54561] [PATCH 1/4] services: Add samba service. References: <2f1eb553-2d1d-2e83-1412-948011d502cc@gmail.com> <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> Gcc: nnfolder+archive:sent.2022-03 Date: Sun, 27 Mar 2022 20:32:16 +0200 In-Reply-To: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> (Maxime Devos's message of "Sun, 27 Mar 2022 16:13:46 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org, fesoj000 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Maxime Devos writes: > fesoj000 schreef op zo 27-03-2022 om 03:07 [+0200]: >> > +(define (samba-activation config) >> > +=C2=A0 (let ((package (samba-configuration-package config)) >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (config-file (samba-config= uration-config-file config))) >> > +=C2=A0=C2=A0=C2=A0 (with-imported-modules '((guix build utils)) >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (let ((lib-directory "/var/lib/samba") >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (l= og-directory "/var/log/samba") >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (r= un-directory "/var/run/samba") >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (s= mb.conf "/etc/samba/smb.conf")) > > Is it necessary to put the configuration file there? > Can be we do something like (system* "/.../testparm" #$smb.conf), where > smb.conf is the generated configuration file? No, not really. The Samba suit has a lot of tools that may want to look into the default config directory. It seems that any relevant configuration belonging to Samba lands in smb.conf, that is looked into anytime when needed. That is my impression, and thus placed it there. >> Is it a good idea to create all those directories with the default >> umask? I always wanted to investigate which of those directories >> contains sensitive data. I never got around to. I'm not so sure myself. That was the end result of what had to be created to have the service successfully initiate itself. True that I have not investigated this myself yet. While writing this service I was comparing the directory structure with Debian and Arch Linux, to be sure that it would work.=20 > > FWIW, you can use 'mkdir-p/perms' to set the permission bits. > The (string-append ...) can be simplified to: > > (system* #$(file-append package "/bin/testparm" "--suppres-prompt > #$smb.conf). > > Also, would it be a good idea to use (invoke ...) instead of system, to > make sure errors are detected? What is the 'suppress-prompt' for? My understanding now would be better to write invoke. Thanks for pointing this out.=20=20 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 27 14:48:45 2022 Received: (at 54561) by debbugs.gnu.org; 27 Mar 2022 18:48:45 +0000 Received: from localhost ([127.0.0.1]:56538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYXwS-0000B4-QQ for submit@debbugs.gnu.org; Sun, 27 Mar 2022 14:48:44 -0400 Received: from smtprelay02.ispgateway.de ([80.67.18.14]:59635) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYXwR-0000Au-Bn for 54561@debbugs.gnu.org; Sun, 27 Mar 2022 14:48:43 -0400 Received: from [91.40.247.147] (helo=motorball) by smtprelay02.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nYXwL-0000NF-Nl; Sun, 27 Mar 2022 20:48:37 +0200 From: Simon Streit To: fesoj000 Subject: Re: [bug#54561] [PATCH 1/4] services: Add samba service. References: <2f1eb553-2d1d-2e83-1412-948011d502cc@gmail.com> Gcc: nnfolder+archive:sent.2022-03 Date: Sun, 27 Mar 2022 20:48:41 +0200 In-Reply-To: <2f1eb553-2d1d-2e83-1412-948011d502cc@gmail.com> (fesoj's message of "Sun, 27 Mar 2022 03:07:33 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) fesoj000 writes: > I have a local service definition for samba i wanted to upstream > at some point. Your service looks better then mine though. Thanks. It still counts as my first try writing a service. > fyi: I currently use samba as an AD DC. Impressive! It might be quite interesting to see how you managed to set up an AD DC. I stopped after certain tools began to crash. I tried to solve them here [1]. I just noticed that you had pushed some patches some time ago too [2]. They're both addressing the same issues. In this case your patches are looking better than mine. That means these tools are working for you now? [1] https://issues.guix.gnu.org/52976 [2] https://issues.guix.gnu.org/54266 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 27 14:51:47 2022 Received: (at 54561) by debbugs.gnu.org; 27 Mar 2022 18:51:47 +0000 Received: from localhost ([127.0.0.1]:56542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYXzP-0000FU-7p for submit@debbugs.gnu.org; Sun, 27 Mar 2022 14:51:47 -0400 Received: from smtprelay03.ispgateway.de ([80.67.18.15]:52509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYXzN-0000FM-U7 for 54561@debbugs.gnu.org; Sun, 27 Mar 2022 14:51:46 -0400 Received: from [91.40.247.147] (helo=motorball) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nYXzQ-0006vg-Ki; Sun, 27 Mar 2022 20:51:48 +0200 From: Simon Streit To: Maxime Devos Subject: Re: [bug#54561] [PATCH 2/4] doc: Add "Samba" chapter. References: <37faa41273793a6fb276ef73399e1e3493be3656.camel@telenet.be> Gcc: nnfolder+archive:sent.2022-03 Date: Sun, 27 Mar 2022 20:51:44 +0200 In-Reply-To: <37faa41273793a6fb276ef73399e1e3493be3656.camel@telenet.be> (Maxime Devos's message of "Sun, 27 Mar 2022 16:15:25 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Df-Sender: bGlzdHNAbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Maxime Devos writes: > Simon Streit schreef op vr 25-03-2022 om 10:01 [+0100]: >> +@item @code{config-file} (default: @code{#f}) >> +The config file to use.=C2=A0 Please note: Setting this variable will d= isable >> +all config options that come after @code{enable-winbindd?}. > > [...] > >> +@item @code{enable-winbindd?} (default: @code{#f}) >> +Manually enable the @code{winbindd} daemon. >> + >> +@end table >> +@end deftp > > I don't see any configuration option after enable-winbindd?. Also, > what does =E2=80=98manually enable=E2=80=99 mean here? How can I determi= ne if this > needs to be done? Can it be done automatically instead of manually? Oh, it looks like I was to quick at trimming my service definition here. There where config options that where removed, and had simply removed the entries in the documentation too without rephrasing the manual properly. I should modify that patch then. From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 27 14:58:39 2022 Received: (at 54561) by debbugs.gnu.org; 27 Mar 2022 18:58:39 +0000 Received: from localhost ([127.0.0.1]:56546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYY63-0000U5-7x for submit@debbugs.gnu.org; Sun, 27 Mar 2022 14:58:39 -0400 Received: from mail-ej1-f54.google.com ([209.85.218.54]:39880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYY60-0000Tq-9y for 54561@debbugs.gnu.org; Sun, 27 Mar 2022 14:58:37 -0400 Received: by mail-ej1-f54.google.com with SMTP id dr20so24527444ejc.6 for <54561@debbugs.gnu.org>; Sun, 27 Mar 2022 11:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=yS9uaSMHA0VPzV7QlWEjqdE6boSwPUnTUDNCyY0uFC0=; b=PFY0Kr9XBckp+30x0SpZd1IoIK3AQc28Ibl0RIVOjY4jD+ALGzGh9OTulxW8RQYqkj oizVvpGpc3r9zFAY86sWEqZLOuPZi1Hfw3+XRJcBkL+cTz2DLc4jzd3zYUvosesPYvrh SNPIj92kaEGZ1WLxDNeTqJpQLSBV0k+xqIgFaBKjY1M9sOuS5AjrbcMizGGfZGvlmQPQ 65HAt73nM1+i0MoCXotN/VriIQrqjBeLCqBdCaTRZk8j5s47sraNa3ljSgDI34Nv65Q/ JErGGQ2RsUoXTOM08Qn+9itfVjNS3tY5y/nw9pmkFW8MaPToUFFgCJxolLks9HIflsXY 8HMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=yS9uaSMHA0VPzV7QlWEjqdE6boSwPUnTUDNCyY0uFC0=; b=obd3NPg49Z53nKOfrGqpZR0UxTm1q0/Tht7iakRbT65NIEx2tH2y8kMzeFoF/4XJYt xwAwv57DkIcVQ9KZPR9lSe1QurrUuuliwsPbggB4fsBgnI/85gdpIELx2lZLPmbwrxrR ZBwOBfNJ39ROoPxOaatzVek/4jOomlXJ6zJqToKcvBNzsdgnBjz96qd7EpGoaP4PnqaH 1VUFQzY87mMhePIzRP+xjJQs6JF3Zeep20RtapaCo4zZYd8+d8U9wLjQjVxDkPTb+5Sn gkTxwCqBQVwjo9CuJR9+4VfJi7kXncszufD/jtL8xCqo/cxD3wqudjMs6IapHPJgGppm OKGA== X-Gm-Message-State: AOAM532aXYIzwrrrAFWuMj3fODccHWmK2uwDD7lcKU0RDbSl8ML3BMqX c/C6HLSU6pa6yczkBcnOf6k= X-Google-Smtp-Source: ABdhPJyotTVR4nNwwVIcNkUfbsovmLahjOYqRsrp1FSkSlWx1ozdaIMYakrdOTXVJ/bvrIlVARSGcA== X-Received: by 2002:a17:906:c111:b0:6db:cf0e:3146 with SMTP id do17-20020a170906c11100b006dbcf0e3146mr23649912ejc.280.1648407510178; Sun, 27 Mar 2022 11:58:30 -0700 (PDT) Received: from ?IPV6:2003:ee:af13:4e00:138c:330:2a14:b8fb? (p200300eeaf134e00138c03302a14b8fb.dip0.t-ipconnect.de. [2003:ee:af13:4e00:138c:330:2a14:b8fb]) by smtp.gmail.com with ESMTPSA id js20-20020a17090797d400b006dfad24c5efsm4860783ejc.44.2022.03.27.11.58.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Mar 2022 11:58:29 -0700 (PDT) Message-ID: Date: Sun, 27 Mar 2022 20:58:30 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [bug#54561] [PATCH 1/4] services: Add samba service. Content-Language: en-US To: Simon Streit References: <2f1eb553-2d1d-2e83-1412-948011d502cc@gmail.com> From: fesoj000 In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) On 3/27/22 8:48 PM, Simon Streit wrote: > fesoj000 writes: > >> I have a local service definition for samba i wanted to upstream >> at some point. Your service looks better then mine though. > > Thanks. It still counts as my first try writing a service. > >> fyi: I currently use samba as an AD DC. > > Impressive! It might be quite interesting to see how you managed to set > up an AD DC. I stopped after certain tools began to crash. I tried to > solve them here [1]. I just noticed that you had pushed some patches > some time ago too [2]. They're both addressing the same issues. In > this case your patches are looking better than mine. > > That means these tools are working for you now? > > [1] https://issues.guix.gnu.org/52976 > [2] https://issues.guix.gnu.org/54266 I mostly followed the step by step guide in the samba wiki [0]. I use this AD DC mostly for testing and developing (kerberos, ldap). While following the step by step guide i found that samba-tool and friends are not working, so i tried to fix them, and yes, they do work for me currently using my patch. My main motivation for running samba as AD DC is that i want to port sssd to guix. Currently i have a hack for glibc which solves the libnss module lookup issue. But all this needs more polish and time.... [0] https://wiki.samba.org/index.php/Setting_up_Samba_as_an_Active_Directory_Domain_Controller From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 27 15:22:47 2022 Received: (at 54561) by debbugs.gnu.org; 27 Mar 2022 19:22:47 +0000 Received: from localhost ([127.0.0.1]:56563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYYTP-00014C-MM for submit@debbugs.gnu.org; Sun, 27 Mar 2022 15:22:47 -0400 Received: from mail-ed1-f47.google.com ([209.85.208.47]:33645) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYYTN-00013y-Bm for 54561@debbugs.gnu.org; Sun, 27 Mar 2022 15:22:45 -0400 Received: by mail-ed1-f47.google.com with SMTP id r23so14730118edb.0 for <54561@debbugs.gnu.org>; Sun, 27 Mar 2022 12:22:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject :content-language:to:content-transfer-encoding; bh=ZM8v+x2vjlbGTA6EL37ta7QtVu07r7sBH4LUdudcLz8=; b=FKHmrebiGpvyWOCxdwQEt9Py9l4avpudn4hdoA0t6FKv9f6Low6a/7joWJsP7iExoV 4vmgIshSUfDSIqc8hfGsAn6ETTMj65ticRf9VEfIuqBu5zyTSoq04H2V7qJMGS45w+6X e4WY4/ndrYjLooWtOrKaXoLkooQ+niontxYS9UfQ28DYhH5u2XH2OYrUQM/JK5g2fcZn IHhx9vOqL4v8wW0r5ynqX3r1pbXSACx9/hcD+LUzEQUZjI63u/r9LJyhRtTwTwup/NDS uulhb8sEkLTjOzkaH+h9v0o2c5ZJ3EBiiYPmSBudUDYUd2EzMwjEjfC7neKbrDakyOhx y5Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:content-language:to:content-transfer-encoding; bh=ZM8v+x2vjlbGTA6EL37ta7QtVu07r7sBH4LUdudcLz8=; b=XXm1p4MbUy6lciUgsGJcOj6dx9bZEj54EmxVxfoaJROwArinUK5Tr677cBD4GeT8cd DpAH2RMkN7ufFfZOJu6BSsYazrPjUJz6dJKpiulStxHiqPTxOt/L4l1VKiHTpYyYdB/h LjFjYOlET/ph0KKXNNnU4rxloQ+1Af2G09ScDR9vQJTjInygRNXsY6VALi7/ShXWIpPR MSqt8Qu/InleclmA52Onm3oIjQmw12YECLlPgoxw2l14xoaCVK/ZxolhJpExuToAijRf m1rdJaA6enenC9PIN4CQl5PpQN+LqDRhY88K7/ZT6ypAaDlxRMmPYobFwEKzhS6CMyBQ e+4g== X-Gm-Message-State: AOAM530cx5oAFiPD7Fr+O+d75iysR/Noa2UQ9M/2ixCc2DbiYg4ws2C4 7xTdVBP+EohEh42oE07t7Lv4sGpfGQo= X-Google-Smtp-Source: ABdhPJxVLehMHX53MrAM89xFOql6kR1PNG14yMA+CiT48q7jXyxZYzDcFzx0EU/M40kwg9OBp6Q4IQ== X-Received: by 2002:a05:6402:50cf:b0:418:ee57:ed9 with SMTP id h15-20020a05640250cf00b00418ee570ed9mr11687378edb.37.1648408959453; Sun, 27 Mar 2022 12:22:39 -0700 (PDT) Received: from ?IPV6:2003:ee:af13:4e00:138c:330:2a14:b8fb? (p200300eeaf134e00138c03302a14b8fb.dip0.t-ipconnect.de. [2003:ee:af13:4e00:138c:330:2a14:b8fb]) by smtp.gmail.com with ESMTPSA id g4-20020a170906520400b006e0b798a0b8sm2870444ejm.94.2022.03.27.12.22.38 for <54561@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Mar 2022 12:22:38 -0700 (PDT) Message-ID: <65a0bbc3-47de-1bf2-b791-5be0d614dcdf@gmail.com> Date: Sun, 27 Mar 2022 21:22:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 From: fesoj000 Subject: [PATCH] gnu: libdaemon: fix build for riscv64 Content-Language: en-US To: 54561@debbugs.gnu.org Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) * gnu/packages/libdaemon.scm: (native-inputs): Add check for riscv64 to include config * gnu/packages/libdaemon.scm: (arguments): Add check for riscv64 to add update-config.sub build step --- gnu/packages/libdaemon.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm index 9dc851e823..e91b651e5a 100644 --- a/gnu/packages/libdaemon.scm +++ b/gnu/packages/libdaemon.scm @@ -49,7 +49,8 @@ (define-public libdaemon (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (native-inputs - (if (and=> (%current-target-system) target-aarch64?) + (if (or (target-aarch64?) + (target-riscv64?)) `(("config" ,config)) ; for config.sub '())) (arguments @@ -66,7 +67,8 @@ (define-public libdaemon ;; Hurd's console client. "--localstatedir=/var")) '()) - ,@(if (and=> (%current-target-system) target-aarch64?) + ,@(if (or (target-aarch64?) + (target-riscv64?)) `(#:phases (modify-phases %standard-phases (add-before 'configure 'update-config.sub -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 27 15:23:36 2022 Received: (at 54561) by debbugs.gnu.org; 27 Mar 2022 19:23:36 +0000 Received: from localhost ([127.0.0.1]:56567 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYYUC-00015r-0J for submit@debbugs.gnu.org; Sun, 27 Mar 2022 15:23:36 -0400 Received: from mail-ej1-f53.google.com ([209.85.218.53]:41794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYYUA-00015d-UL for 54561@debbugs.gnu.org; Sun, 27 Mar 2022 15:23:35 -0400 Received: by mail-ej1-f53.google.com with SMTP id a8so24556891ejc.8 for <54561@debbugs.gnu.org>; Sun, 27 Mar 2022 12:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language :from:to:references:in-reply-to:content-transfer-encoding; bh=soPvX2hbsQTW6Q8v9ksfy/PBDpRWvNYX/8MDnBoVh2w=; b=cw+XroN5xNQVhlMEfh3ov3bANQJLarGW3y455jRSIopl72B1YEbIUc4wzqXj8/ytxG fDhnhhHSHWE8doM3dZH+QH7iEWPSKX/skpEPr90Oqs2B46V3EXipQxE5HzR75LGfNRzp 9Cde3NgoSYVdA/EpiGw1KqJLHuyP9bPMcCjy5ASW8Jp2Q2ocITF+slnQZoev7ugEjhw2 q9hwKlbuJ0kSpmTme0n9YS1ugJbNrCOqgK7EXAF3EK5EH7vwmAHBNtZh5h6FyBlis7Ey WhzL2tP4mREWAYQrUpYuaiY/CYDBHjbQXCWikp54fTLnw9vRrls/vw6N3X+G26bhCxep fpQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:from:to:references:in-reply-to :content-transfer-encoding; bh=soPvX2hbsQTW6Q8v9ksfy/PBDpRWvNYX/8MDnBoVh2w=; b=UFio3qA17f8G4Z6p2vMlBCv1V4AxmYjQOluWSciOusDGOrZTEElUl2UDXkNtsp905w vfhprTnzZYqOVHiegkQ5xbPm4uAbVlKhYt5vLXlKIkwfi8hry9/UZbmMr/E98XZ2j2OK /TUpk3akJrDRr10AmrlNZe/unDziLjokl7Xt76qz4UDnRFMan5p+FUWwmRistCbZd83e nq0VmxALm2KMBV8tKb5LJwVwDm0Z583I0swHhE3X0XRPnsxYkG77mmDK1VNJu+MqXTNM eENLXqckL9uaC+3tPG/a6e1AYbaf/QrvfgXvkz266+xo00mipH9tBNGizd9F8/vPQY/x PJMA== X-Gm-Message-State: AOAM533A/0pVBIYaWvmtU0zhnKaBVc2rxS2dar4FqPKP7nnCkLgrw1PQ MTqbOWqefpepNqi07KaSFvK9FmGoZpw= X-Google-Smtp-Source: ABdhPJz0iA5qSm+HUSt4CMJIgIvtV0y6/VviUzJQxxPskBz2mOYxYnSWVCODGu8S06LpyMgRv8G8SA== X-Received: by 2002:a17:907:da7:b0:6df:9ff4:10c7 with SMTP id go39-20020a1709070da700b006df9ff410c7mr23020091ejc.106.1648409009138; Sun, 27 Mar 2022 12:23:29 -0700 (PDT) Received: from ?IPV6:2003:ee:af13:4e00:138c:330:2a14:b8fb? (p200300eeaf134e00138c03302a14b8fb.dip0.t-ipconnect.de. [2003:ee:af13:4e00:138c:330:2a14:b8fb]) by smtp.gmail.com with ESMTPSA id d1-20020a17090694c100b006da91d57e93sm4874682ejy.207.2022.03.27.12.23.27 for <54561@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Mar 2022 12:23:27 -0700 (PDT) Message-ID: Date: Sun, 27 Mar 2022 21:23:27 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH] gnu: libdaemon: fix build for riscv64 Content-Language: en-US From: fesoj000 To: 54561@debbugs.gnu.org References: <65a0bbc3-47de-1bf2-b791-5be0d614dcdf@gmail.com> In-Reply-To: <65a0bbc3-47de-1bf2-b791-5be0d614dcdf@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) please ignore this email, send to the wrong issue number. On 3/27/22 9:22 PM, fesoj000 wrote: > * gnu/packages/libdaemon.scm: (native-inputs): Add check for riscv64 to > include config > * gnu/packages/libdaemon.scm: (arguments): Add check for riscv64 to add > update-config.sub build step > --- >  gnu/packages/libdaemon.scm | 6 ++++-- >  1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/libdaemon.scm b/gnu/packages/libdaemon.scm > index 9dc851e823..e91b651e5a 100644 > --- a/gnu/packages/libdaemon.scm > +++ b/gnu/packages/libdaemon.scm > @@ -49,7 +49,8 @@ (define-public libdaemon >               (file-name (string-append name "-" version ".tar.gz")))) >      (build-system gnu-build-system) >      (native-inputs > -     (if (and=> (%current-target-system) target-aarch64?) > +     (if (or (target-aarch64?) > +             (target-riscv64?)) >           `(("config" ,config)) ; for config.sub >           '())) >      (arguments > @@ -66,7 +67,8 @@ (define-public libdaemon >                                         ;; Hurd's console client. >                                         "--localstatedir=/var")) >               '()) > -       ,@(if (and=> (%current-target-system) target-aarch64?) > +       ,@(if (or (target-aarch64?) > +                 (target-riscv64?)) >               `(#:phases >                 (modify-phases %standard-phases >                   (add-before 'configure 'update-config.sub From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 14:22:15 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 18:22:15 +0000 Received: from localhost ([127.0.0.1]:35897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFP-0003YD-Km for submit@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:15 -0400 Received: from smtprelay05.ispgateway.de ([80.67.31.93]:62804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFN-0003Xx-Sc for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:14 -0400 Received: from [212.202.170.33] (helo=milk.d22.home.arpa) by smtprelay05.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1nctFg-0007s3-OD; Fri, 08 Apr 2022 20:22:32 +0200 From: Simon Streit To: 54561@debbugs.gnu.org Subject: v2 [PATCH 0/5] Add service declarations for Samba Date: Fri, 8 Apr 2022 20:21:26 +0200 Message-Id: <20220408182131.10271-1-simon@netpanic.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Please find attached an updated patch series. I've made slight changes as follows: * The reference to further config options in the manual have been removed. * Samba's (samba-activation config) procedure has been slightly modified, * better cleaned up, regarding the mkdirs. I've done more testing and it * appears that samba will only run when /var/{lib,log,run}/samba exist, including /var/lib/samba/private. In this case it is chmod now to o700 to be on the save side. Debian's directory structure is world readable though. In Arch it is o700. If anyone objects, please make it world readable. It appears that Samba lives and breathes in these directories, so they better be put there. * Regarding smb.conf -- while this service technically doesn't need it placed at /etc/samba -- is convenient to have it placed there for other tools part of the Samba family to read it, and so that others can quickly look into its configuration. I'll leave this for further debate whether it can stay there or not. * The packages samba and wsdd are included in profile-service-type so that they are generally available in the system profile. I hope I didn't miss anything out. Simon Streit (5): services: Add samba service. doc: Add "Samba" chapter. doc: Add documentation for WSDD service. services: Add wsdd service. gnu: Add wsdd. doc/guix.texi | 118 ++++++++++++++++++ gnu/packages/samba.scm | 26 ++++ gnu/services/samba.scm | 277 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 421 insertions(+) create mode 100644 gnu/services/samba.scm -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 14:22:18 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 18:22:18 +0000 Received: from localhost ([127.0.0.1]:35900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFR-0003YS-SH for submit@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:18 -0400 Received: from smtprelay05.ispgateway.de ([80.67.31.93]:19591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFP-0003Y6-0N for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:15 -0400 Received: from [212.202.170.33] (helo=milk.d22.home.arpa) by smtprelay05.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1nctFj-0007s3-E5; Fri, 08 Apr 2022 20:22:35 +0200 From: Simon Streit To: 54561@debbugs.gnu.org Subject: v2 [PATCH 1/5] services: Add samba service. Date: Fri, 8 Apr 2022 20:21:27 +0200 Message-Id: <20220408182131.10271-2-simon@netpanic.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408182131.10271-1-simon@netpanic.org> References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/samba.scm (): New record. (samba-service-type): New variable. (samba-shepherd-services): New Procedure. --- gnu/services/samba.scm | 177 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 gnu/services/samba.scm diff --git a/gnu/services/samba.scm b/gnu/services/samba.scm new file mode 100644 index 0000000000..70b07f93fb --- /dev/null +++ b/gnu/services/samba.scm @@ -0,0 +1,177 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Simon Streit +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services samba) + + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages admin) + #:use-module (gnu packages samba) + + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu services shepherd) + #:use-module (gnu services base) + #:use-module (gnu system shadow) + + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix modules) + #:use-module (guix records) + + #:use-module (ice-9 format) + #:use-module (ice-9 match) + #:use-module (ice-9 textual-ports) + #:use-module (srfi srfi-1) + + #:export (samba-service-type + samba-configuration + samba-smb-conf + + wsdd-service-type + wsdd-configuration)) + +(define %smb-conf + (plain-file "smb.conf" "[global] + workgroup = WORKGROUP + server string = Samba Server + server role = standalone server + log file = /var/log/samba/log.%m + logging = file +")) + +(define-record-type* + samba-configuration + make-samba-configuration + samba-configuration? + (package samba-configuration-package + (default samba)) + (config-file samba-configuration-config-file + (default #f)) + (enable-samba? samba-configuration-enable-samba? + (default #f)) + (enable-smbd? samba-configuration-enable-smbd? + (default #t)) + (enable-nmbd? samba-configuration-enable-nmbd? + (default #t)) + (enable-winbindd? samba-configuration-enable-winbindd? + (default #t))) + +(define (samba-activation config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (with-imported-modules '((guix build utils)) + (let ((lib-dir "/var/lib/samba") + (log-dir "/var/log/samba") + (run-dir "/var/run/samba") + (etc-dir "/etc/samba") + (smb.conf "/etc/samba/smb.conf")) + #~(begin + (use-modules (guix build utils)) + (mkdir-p #$etc-dir) + (mkdir-p #$lib-dir) + (mkdir-p/perms (string-append #$lib-dir "/private") + (getpwnam "root") #o700) + (mkdir-p #$log-dir) + (mkdir-p #$run-dir) + (copy-file #$config-file #$smb.conf) + (invoke #$(file-append package "/bin/testparm") + "--suppress-prompt" #$smb.conf)))))) + +(define (samba-samba-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run Samba") + (provision '(samba-samba)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/samba") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-nmbd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run NMBD") + (provision '(samba-nmbd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/nmbd") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-smbd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run SMBD") + (provision '(samba-smbd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/smbd") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-winbindd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run Winnbindd for Name Service Switch") + (provision '(samba-winbindd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/winbindd") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-shepherd-services config) + (append (if (samba-configuration-enable-samba? config) + (samba-samba-shepherd-service config) + '()) + (if (samba-configuration-enable-nmbd? config) + (samba-nmbd-shepherd-service config) + '()) + (if (samba-configuration-enable-smbd? config) + (samba-smbd-shepherd-service config) + '()) + (if (samba-configuration-enable-winbindd? config) + (samba-winbindd-shepherd-service config) + '()))) + +(define samba-service-type + (service-type + (name 'samba) + (description "Samba") + (extensions + (list (service-extension shepherd-root-service-type + samba-shepherd-services) + (service-extension activation-service-type + samba-activation) + (service-extension profile-service-type + (compose list samba-configuration-package)))) + (default-value (samba-configuration)))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 14:22:18 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 18:22:18 +0000 Received: from localhost ([127.0.0.1]:35903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFS-0003YV-Af for submit@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:18 -0400 Received: from smtprelay05.ispgateway.de ([80.67.31.93]:52655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFR-0003YL-2V for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:17 -0400 Received: from [212.202.170.33] (helo=milk.d22.home.arpa) by smtprelay05.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1nctFl-0007s3-O0; Fri, 08 Apr 2022 20:22:37 +0200 From: Simon Streit To: 54561@debbugs.gnu.org Subject: v2 [PATCH 2/5] doc: Add "Samba" chapter. Date: Fri, 8 Apr 2022 20:21:28 +0200 Message-Id: <20220408182131.10271-3-simon@netpanic.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408182131.10271-1-simon@netpanic.org> References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- doc/guix.texi | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index e8ef4286be..70f78c601a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -101,6 +101,7 @@ Copyright @copyright{} 2021 Andrew Tropin@* Copyright @copyright{} 2021 Sarah Morgensen@* Copyright @copyright{} 2021 Josselin Poiret@* Copyright @copyright{} 2022 Remco van 't Veer@* +Copyright @copyright{} 2022 Simon Streit@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -368,6 +369,7 @@ Services * DNS Services:: DNS daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. +* Samba Services:: Samba services. * Continuous Integration:: Cuirass and Laminar services. * Power Management Services:: Extending battery life. * Audio Services:: The MPD. @@ -29861,6 +29863,56 @@ The verbosity level of the daemon. @end table @end deftp +@node Samba Services, Continuous Integration, Network File System, Services +@subsection Samba Services + +@cindex samba +@cindex smb +The @code{(gnu services samba)} module provides Guix service definitions +for Samba as well as additional helper services. Currently it provides +the following services: + +@subsubheading Samba + +Samba provides network shares for folder and printers, it can also be an +AD DC for other samba hosts in an heterougenious network with different +types of Computer systems. + +@defvar{samba-service-type} + +The service type to enable the samba services @code{samba}, @code{nmbd}, +@code{smbd} and @code{winbindd}. By default this service type does not +run as an AD DC, hence @code{samba} remains disabled. It is recommended +that Samba's package is added to the system profile to have the tool-set +available for modifications in Samba's runtime directories. + +@end defvar + +@deftp{Data Type} samba-service-configuration +Configuration record for the Samba suite. + +@table @asis +@item @code{package} (default: @code{samba}) +The samba package to use. + +@item @code{config-file} (default: @code{#f}) +The config file to use. + +@item @code{enable-samba?} (default: @code{#f}) +Manually enable the @code{samba} daemon. + +@item @code{enable-smbd?} (default: @code{#f}) +Manually enable the @code{smbd} daemon. + +@item @code{enable-nmbd?} (default: @code{#f}) +Manually enable the @code{nmbd} daemon. + +@item @code{enable-winbindd?} (default: @code{#f}) +Manually enable the @code{winbindd} daemon. + +@end table +@end deftp + @node Continuous Integration @subsection Continuous Integration -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 14:22:20 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 18:22:20 +0000 Received: from localhost ([127.0.0.1]:35906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFT-0003Yv-Pn for submit@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:20 -0400 Received: from smtprelay05.ispgateway.de ([80.67.31.93]:63711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFS-0003YT-6G for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:18 -0400 Received: from [212.202.170.33] (helo=milk.d22.home.arpa) by smtprelay05.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1nctFm-0007s3-R2; Fri, 08 Apr 2022 20:22:38 +0200 From: Simon Streit To: 54561@debbugs.gnu.org Subject: v2 [PATCH 3/5] doc: Add documentation for WSDD service. Date: Fri, 8 Apr 2022 20:21:29 +0200 Message-Id: <20220408182131.10271-4-simon@netpanic.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408182131.10271-1-simon@netpanic.org> References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- doc/guix.texi | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 70f78c601a..fa3c7d8b51 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -29913,6 +29913,72 @@ Manually enable the @code{winbindd} daemon. @end table @end deftp +@cindex wsdd +@subsubheading Web Service Discovery Daemon + +Web Service Discovery Daemon implements the WSD protocoll. It is a +drop-in replacement for host discovery that lack support for the SMBv1 +protocol. + +@defvr{Scheme Variable} wsdd-service-type + +Service type for the Web Service Discoery host daemon. The value for +this service type is a @code{wsdd-configuration} record. The details +for the @code{wsdd-configuration} record type are given below. +@end defvr + +@deftp{Data Type} wsdd-configuration This data type represents the +configuration for the wsdd service. + +@table @asis + +@item @code{package} (default: @code{wsdd}) +The wsdd package to use. + +@item @code{ipv4only?} (default: @code{#f}) +Only listen to ipv4 addresses. + +@item @code{ipv6only} (default: @code{#f}) +Only listen to ipv6 addresses. Please note: Activating both options is +not possible, since there would be no ip versions to listen to. + +@item @code{chroot} (default: @code{#f}) +Chroot into a sperate directory to prevent access to other directories. +This is to increase security in case there is a vulnerability in +@command{wsdd}. + +@item @code{hoplimit} (default: @code{1}) +Limit to the level of hops for multicast packets. The default is +@var{1} which should prevent packets from leaving the local network. + +@item @code{interface} (default: @code{'()}) +Limit to the given list of interfaces to listen to. By default wsdd +will listen to all interfaces. Except the loopback interface is never +used. + +@item @code{uuid-device} (default: @code{#f}) +The WSD protocol requires a device to have a UUID. Set this to manually +assign the service a UUID. + +@item @code{domain} (default: @code{#f}) +Notify this host is a member of an Active Directory. + +@item @code{hostname} (default: @code{#f}) +Manually set the hostname rather than letting @command{wsdd} inherit +this host's hostname. + +@item @code{preserve-case?} (default: @code{#f}) +By default @command{wsdd} will convert the hostname in workgroup to all +uppercase. The opposite is true for hostnames in domains. Setting this +parameter will preserve case. + +@item @code{workgroup} (default: @var{"WORKGROUP"}) +Change the name of the workgroup. By default @command{wsdd} reports +this host being member of a workgroup. + +@end table +@end deftp + @node Continuous Integration @subsection Continuous Integration -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 14:22:22 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 18:22:22 +0000 Received: from localhost ([127.0.0.1]:35909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFW-0003ZA-2z for submit@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:22 -0400 Received: from smtprelay05.ispgateway.de ([80.67.31.93]:16579) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFT-0003Yo-7G for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:19 -0400 Received: from [212.202.170.33] (helo=milk.d22.home.arpa) by smtprelay05.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1nctFn-0007s3-SN; Fri, 08 Apr 2022 20:22:40 +0200 From: Simon Streit To: 54561@debbugs.gnu.org Subject: v2 [PATCH 4/5] services: Add wsdd service. Date: Fri, 8 Apr 2022 20:21:30 +0200 Message-Id: <20220408182131.10271-5-simon@netpanic.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408182131.10271-1-simon@netpanic.org> References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/samba.scm (): New record. (wsdd-service-type): New variable. (wsdd-shepherd-services): New procedure. --- gnu/services/samba.scm | 100 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/gnu/services/samba.scm b/gnu/services/samba.scm index 70b07f93fb..d15d916363 100644 --- a/gnu/services/samba.scm +++ b/gnu/services/samba.scm @@ -175,3 +175,103 @@ (define samba-service-type (service-extension profile-service-type (compose list samba-configuration-package)))) (default-value (samba-configuration)))) + + +;;; +;;; WSDD +;;; + +(define-record-type* + wsdd-configuration + make-wsdd-configuration + wsdd-configuration? + (package wsdd-configuration-package + (default wsdd)) + (ipv4only? wsdd-configuration-ipv4only? + (default #f)) + (ipv6only? wsdd-configuration-ipv6only? + (default #f)) + (chroot wsdd-configuration-chroot + (default #f)) + (hoplimit wsdd-configuration-hoplimit + (default 1)) + (interfaces wsdd-configuration-interfaces + (default '())) + (uuid-device wsdd-configuration-uuid-device + (default #f)) + (domain wsdd-configuration-domain + (default #f)) + (hostname wsdd-configuration-hostname + (default #f)) + (preserve-case? wsdd-configuration-preserve-case? + (default #f)) + (workgroup wsdd-configuration-workgroup + (default "WORKGROUP"))) + +(define wsdd-accounts + (list + (user-group (name "wsdd")) + (user-account (name "wsdd") + (group "wsdd") + (comment "Web Service Discovery user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))) + +(define wsdd-shepherd-service + (match-lambda + (($ package ipv4only? ipv6only? chroot hoplimit + interfaces uuid-device domain hostname + preserve-case? workgroup) + (list (shepherd-service + (documentation "Run a Web Service Discovery service") + (provision '(wsdd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/bin/wsdd") + #$@(if ipv4only? + #~("--ipv4only") + '()) + #$@(if ipv6only? + #~("--ipv6only") + '()) + #$@(if chroot + #~("--chroot" #$chroot) + '()) + #$@(if hoplimit + #~("--hoplimit" #$(number->string hoplimit)) + '()) + #$@(map (lambda (interfaces) + (string-append "--interface=" interfaces)) + interfaces) + #$@(if uuid-device + #~("--uuid" #$uuid-device) + '()) + #$@(if domain + #~("--domain" #$domain) + '()) + #$@(if hostname + #~("--hostname" #$hostname) + '()) + #$@(if preserve-case? + #~("--preserve-case") + '()) + #$@(if workgroup + #~("--workgroup" #$workgroup) + '())) + #:user "wsdd" + #:group "wsdd" + #:log-file "/var/log/wsdd.log")) + (stop #~(make-kill-destructor))))))) + +(define wsdd-service-type + (service-type + (name 'wsdd) + (description "Web Service Discovery Daemon") + (extensions + (list (service-extension shepherd-root-service-type + wsdd-shepherd-service) + (service-extension account-service-type + (const wsdd-accounts)) + (service-extension profile-service-type + (compose list wsdd-configuration-package)))) + (default-value (wsdd-configuration)))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 14:22:22 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 18:22:22 +0000 Received: from localhost ([127.0.0.1]:35911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFW-0003ZC-DM for submit@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:22 -0400 Received: from smtprelay05.ispgateway.de ([80.67.31.93]:27969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nctFU-0003Z2-L6 for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 14:22:20 -0400 Received: from [212.202.170.33] (helo=milk.d22.home.arpa) by smtprelay05.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1nctFp-0007s3-AD; Fri, 08 Apr 2022 20:22:41 +0200 From: Simon Streit To: 54561@debbugs.gnu.org Subject: v2 [PATCH 5/5] gnu: Add wsdd. Date: Fri, 8 Apr 2022 20:21:31 +0200 Message-Id: <20220408182131.10271-6-simon@netpanic.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408182131.10271-1-simon@netpanic.org> References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/samba.scm (wsdd): New variable. --- gnu/packages/samba.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index b775ad905c..21a5fe8617 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -500,3 +500,29 @@ (define-public ppp ;; chat is public domain. (license (list bsd-3 bsd-4 gpl2+ public-domain)))) +(define-public wsdd + (package + (name "wsdd") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/christgau/wsdd") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04an2w6hamnai668ag4vq8x0i09fsg2jrayb4a7ar0x6bn837k7m")))) + (build-system copy-build-system) + (inputs + `(("python" ,python))) + (arguments + '(#:install-plan + '(("src/wsdd.py" "bin/wsdd") + ("man/wsdd.1" "share/man/man1/")))) + (home-page "https://github.com/christgau/wsdd") + (synopsis "A Web Service Discovery host daemon") + (description "This daemon allows (Samba) hosts to be found by Web +Service Dicovery Clients. It also implements the client side of the +discovery protocol which allows to search for devices implementing +WSD.") + (license expat))) -- 2.34.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 17:23:29 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 21:23:29 +0000 Received: from localhost ([127.0.0.1]:36170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncw4m-0008Gj-KA for submit@debbugs.gnu.org; Fri, 08 Apr 2022 17:23:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncw4l-0008GK-Bg for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 17:23:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46112) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncw4g-0003pC-1R; Fri, 08 Apr 2022 17:23:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=E1Jq6NIwGwd/3fFZH8uBgr0EkxTUYfQUd5Kuv7KT5lk=; b=MC52oQsfOAwsnm0lQSa+ 96JqL7d5rKxRJ1j5fut8ENZBYnD9la8DUam11XVkihaHoTPNTXXtGTWF/nZ6JBZUraKvmu5scejoS Et5C0xZYiWozSyrgA9wI3LNNlu0SYSvQ94lNAMIXPA4v5lk6ga3r//xSIh4gsOHVaTsMNdRDtfIoP cwvS4kcT1VSEJkyxDFhItRTyD8OKubSSYHYkwr4l/SVSTrovbwnA5upMnYWUjB/3cfIE7CdPIsW17 Qo9Ls2uPx8G8GwXlpF+youny4tqbrjzvi6R97xakcK2BJRaXX4GCTdl/C0IViHfHTmFk/UJwTVnGu bFiKxX8f5mCITg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:49434 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncw4f-00037s-8c; Fri, 08 Apr 2022 17:23:21 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon Streit Subject: Re: bug#54561: [PATCH 0/4] Add service declarations for Samba References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> Date: Fri, 08 Apr 2022 23:23:18 +0200 In-Reply-To: <20220408182131.10271-1-simon@netpanic.org> (Simon Streit's message of "Fri, 8 Apr 2022 20:21:26 +0200") Message-ID: <87o81b9smx.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Simon, Simon Streit skribis: > Please find attached an updated patch series. It=E2=80=99s a huge amount of work that you did, and that=E2=80=99ll certai= nly be useful to many! > I've made slight changes as follows: > > * The reference to further config options in the manual have been remove= d. > * Samba's (samba-activation config) procedure has been slightly modified, > * better cleaned up, regarding the mkdirs. I've done more testing and it > * appears that samba will only run when /var/{lib,log,run}/samba exist, > including /var/lib/samba/private. In this case it is chmod now to o70= 0 to > be on the save side. Debian's directory structure is world readable t= hough. > In Arch it is o700. If anyone objects, please make it world readable.= It > appears that Samba lives and breathes in these directories, so they be= tter > be put there.=20 > * Regarding smb.conf -- while this service technically doesn't need it p= laced > at /etc/samba -- is convenient to have it placed there for other tools= part > of the Samba family to read it, and so that others can quickly look in= to its > configuration. I'll leave this for further debate whether it can stay= there > or not. > * The packages samba and wsdd are included in profile-service-type so th= at they > are generally available in the system profile. I didn=E2=80=99t look at everything in detail, but overall that LGTM. There=E2=80=99s a couple of things that I think would be worth adjusting th= ough: > services: Add samba service. > doc: Add "Samba" chapter. > doc: Add documentation for WSDD service. > services: Add wsdd service. > gnu: Add wsdd. It seems patches are in the wrong order: I=E2=80=99d expect the wsdd packag= e to come before the wsdd service. Regarding documentation: by convention, documentation for a service is added in the same commit that adds the service, so that it=E2=80=99s self-contained. Could you squash them? Last, it would be great if you could add a system test under gnu/tests/samba.scm. Essentially, that test would do what you probably did manually already: spawning a VM running an OS with =E2=80=98samba-service-type=E2=80=99 and/or =E2=80=98wsdd-service-type=E2= =80=99 and running an SMB and/or WSD client to make sure the basics work. You can get inspiration from other system tests there, and see: https://guix.gnu.org/manual/devel/en/html_node/Running-the-Test-Suite.html I have minor cosmetic comments that I=E2=80=99ll send separately. Could you send a v3 addressing these issues? Thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 17:26:31 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 21:26:31 +0000 Received: from localhost ([127.0.0.1]:36193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncw7i-0008MJ-RZ for submit@debbugs.gnu.org; Fri, 08 Apr 2022 17:26:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncw7g-0008M7-Iq for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 17:26:28 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46148) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncw7a-0004ac-VD; Fri, 08 Apr 2022 17:26:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=7Gmd1bY7DU/EVLrMeltg5fzcAGExXFhyLiZTe0Hx1D4=; b=ldBCJSxXdkVhg8vrfTgG HnNYmfe6+SlguYs8mce32EKXbDuR10FtcUh5VqOS2js7ZX+hLwZz7EuEWBspuNeOEKoPTDyq9lhBk 7cfAQJlxgtSIcz3W7Q5j3YdQ1lkqPwC/ecjA9dBMUIFQbLiGg3V+YQpeJf/uKuoLmcdKVvfuFP3sl jQVsTYfCwKCdhMzOzWckvmzQLIhTpaF/lMfBXjySjvSNS5TWqe69j54IOl22GwJP0QUel9b6NmHtT dW0qnZIMPrzMl3Flruym7pbAS6uE7Vsf5O6G9soR0IHX+iLRQCg1ovpsbDLpum2PZNF7+Ckc3ABMF Qrs2nJ78Fh5NFg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:50134 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncw7a-0003qC-Io; Fri, 08 Apr 2022 17:26:22 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon Streit Subject: Re: bug#54561: [PATCH 0/4] Add service declarations for Samba References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> <20220408182131.10271-2-simon@netpanic.org> Date: Fri, 08 Apr 2022 23:26:20 +0200 In-Reply-To: <20220408182131.10271-2-simon@netpanic.org> (Simon Streit's message of "Fri, 8 Apr 2022 20:21:27 +0200") Message-ID: <87k0bz9shv.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Simon Streit skribis: > * gnu/services/samba.scm (): New record. > (samba-service-type): New variable. > (samba-shepherd-services): New Procedure. Just write =E2=80=9CNew file.=E2=80=9D, that=E2=80=99s enough. Please also add it to gnu/local.mk and to po/guix/POTFILES.in. [...] > + #:export (samba-service-type > + samba-configuration > + samba-smb-conf > + > + wsdd-service-type > + wsdd-configuration)) These two lines shouldn=E2=80=99t be here for now. :-) > +(define samba-service-type > + (service-type > + (name 'samba) > + (description "Samba") > + (extensions > + (list (service-extension shepherd-root-service-type > + samba-shepherd-services) > + (service-extension activation-service-type > + samba-activation) > + (service-extension profile-service-type > + (compose list samba-configuration-package))= )) > + (default-value (samba-configuration)))) Please add a =E2=80=98description=E2=80=99 field with Texinfo markup (it=E2= =80=99s the description you see when running =E2=80=98guix system search=E2=80=99.) From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 17:35:58 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 21:35:58 +0000 Received: from localhost ([127.0.0.1]:36204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncwGr-00009X-PL for submit@debbugs.gnu.org; Fri, 08 Apr 2022 17:35:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58026) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncwGq-00009K-DM for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 17:35:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncwGk-0005yI-SV; Fri, 08 Apr 2022 17:35:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=8TIWsH1hLZDx1UHUwYH7KB63/G/knw4D0r+Uhu8JnkE=; b=k4eUvFqYYqZ3wVgg8CGh 5hQ29j8+lDqZ1X/oO7yikNila+WLi53d41s5ILDhcS1bJ7ImHAcvKeIUY1faM7+3yrif9fIWAzTo4 1mMiweokie+1uiQ4UcKIu65dEzYO20CNnKFRuRjqXhMTaNnFcQBHGruRnBLuC8FOhaTjgdxkH2GSN 7YFbcqqD0xuhINT0jE3Gy0zzmDLCgmnaunwJntqitTJp3cMmlTIaQtKqk49t2zCwaInOQAoLHQ0J3 tOudRZgyfR1Hg0ajd3M6TCtI2llRLSXBA/yFMP+JDoh8zs8tnFJ5NYbxzxvi+X18qWvgbKEyOvq4L 4PjBzkLOfdq2Kg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:49503 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncwGk-0007RB-0M; Fri, 08 Apr 2022 17:35:50 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon Streit Subject: Re: bug#54561: [PATCH 0/4] Add service declarations for Samba References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> <20220408182131.10271-3-simon@netpanic.org> Date: Fri, 08 Apr 2022 23:35:48 +0200 In-Reply-To: <20220408182131.10271-3-simon@netpanic.org> (Simon Streit's message of "Fri, 8 Apr 2022 20:21:28 +0200") Message-ID: <87czhr9s23.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Simon Streit skribis: > +@cindex samba > +@cindex smb =E2=80=9CSamba=E2=80=9D and =E2=80=9CSMB=E2=80=9D. > +The @code{(gnu services samba)} module provides Guix service definitions s/Guix// > +for Samba as well as additional helper services. Currently it provides > +the following services: > + > +@subsubheading Samba Remove colon after =E2=80=9Cservices=E2=80=9D (what follows is not a bullet= list). > +Samba provides network shares for folder and printers, How about: @uref{https://www.samba.org, Samba} provides networks shares for folders and printers using the SMB/CIFS protocol commonly used on Windows. > it can also be an > +AD DC for other samba hosts in an heterougenious network with different What=E2=80=99s an =E2=80=9CAD DC=E2=80=9D? In general please expand acrony= ms on their first occurrence. > +types of Computer systems. Lowercase. > +@defvar{samba-service-type} Please use @defvr as is done elsewhere in the manual. > +The service type to enable the samba services @code{samba}, @code{nmbd}, > +@code{smbd} and @code{winbindd}. By default this service type does not > +run as an AD DC, hence @code{samba} remains disabled. It is recommended > +that Samba's package is added to the system profile to have the tool-set Samba is now added to the system profile, right? Should this sentence be removed? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 17:41:25 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 21:41:25 +0000 Received: from localhost ([127.0.0.1]:36210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncwM9-0000Hq-Ee for submit@debbugs.gnu.org; Fri, 08 Apr 2022 17:41:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncwM8-0000Hb-C8 for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 17:41:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncwM3-0006lb-1p; Fri, 08 Apr 2022 17:41:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=ckrh5wtv6XVhgL+PxlkVewCx8GycZ753WiGsQm7TvUg=; b=haItsBjai9ktuNYIqYPR y//+GG4Kr6jOySlcS4JZnVJaYIPFj/odWc2Ae+CuBrLHawSPMk4hnKoAxTvtUmONwEcmgAmrwXHj2 ce1PS1Vxx0hDPmnGNHxLdDPAxIgEw4/AYWpbqleHERvB+slopjPz+tBsoLVTWmRjhOB0C5lpwvvF9 5bdlurnYy/7R029BPOysM7SXOqinuAVsj+bv3sDpM/OID13WszByHGO+CcrQFJr0L+fbnq07PClvH XQxHNBjIjRlC7tSDYQeb/hRchW4zTjJzMbD59483Ea+UtyftOobeBJzSu8W4QVzfnmMoJsFeraDYn Hg9ZqEaW5+lRRQ==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=52606 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncwM2-0007rA-LP; Fri, 08 Apr 2022 17:41:18 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon Streit Subject: Re: bug#54561: [PATCH 0/4] Add service declarations for Samba References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> <20220408182131.10271-4-simon@netpanic.org> Date: Fri, 08 Apr 2022 23:41:16 +0200 In-Reply-To: <20220408182131.10271-4-simon@netpanic.org> (Simon Streit's message of "Fri, 8 Apr 2022 20:21:29 +0200") Message-ID: <878rsf9rsz.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Simon Streit skribis: > +@cindex wsdd > +@subsubheading Web Service Discovery Daemon > + > +Web Service Discovery Daemon implements the WSD protocoll. Please provide a bit of context, for example: The Web Service Discovery daemon (wsdd) implements, not surprisingly, Web Service Discovery (WSD), a protocol for =E2=80=A6 > It is a > +drop-in replacement for host discovery that lack support for the SMBv1 > +protocol. That too would need a bit more context IMO. > +@defvr{Scheme Variable} wsdd-service-type ^ Missing space (in other similar places too). > +Service type for the Web Service Discoery host daemon. The value for Typo; but you can write =E2=80=9CWSD=E2=80=9D here, since that has been int= roduced above. > +@item @code{ipv6only} (default: @code{#f}) > +Only listen to ipv6 addresses. Please note: Activating both options is > +not possible, since there would be no ip versions to listen to. =E2=80=9CIPv6=E2=80=9D, =E2=80=9CIP=E2=80=9D. > +@item @code{chroot} (default: @code{#f}) > +Chroot into a sperate directory to prevent access to other directories. =E2=80=9Cseparate=E2=80=9D > +This is to increase security in case there is a vulnerability in > +@command{wsdd}. > + > +@item @code{hoplimit} (default: @code{1}) s/hoplimit/hop-limit/ (two words), and in the code too. > +@item @code{hostname} (default: @code{#f}) Likewise, preferably =E2=80=98host-name=E2=80=99. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 08 17:43:42 2022 Received: (at 54561) by debbugs.gnu.org; 8 Apr 2022 21:43:42 +0000 Received: from localhost ([127.0.0.1]:36215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncwOL-0000L9-T0 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 17:43:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncwOK-0000Kx-7K for 54561@debbugs.gnu.org; Fri, 08 Apr 2022 17:43:40 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:46278) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncwOE-000743-VY; Fri, 08 Apr 2022 17:43:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=s38dpFJOqhXDFOosNuStm+GsMccIi2AkVczfbJ10QN4=; b=YU29WVGNZ++xCNlDT2Id I7Fw+nseI1Oxf17Ji/8WdsMX5nhWsUrkRl3GvWSjaU0YDiJIin+ZcNTRcv1MUc2RJxwm2+fP0q/Iz 6Zm+W9uKVI00atSh/a1I2Bv3/P/O9SqT9WRqbBW0wiCw13+fIobGzXwQewRLhuf4+E1j01x2K5ew4 PJFcJQ99fLej69cPU0c1ghnSuauu3i3uoXw9rihx8CNOXhCnBvhAFuCl3RUIvcEpMhUeo3XBfsxZC ubp84aRfqoOj0TJBQ6RLoUiFKnG88CYnPage85gGSlEqfH5fJqU0GK0XbXbMGm12gcXsIFBbjNHaz 7lb4E1uQ3acqwA==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=52608 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncwOE-00083L-IJ; Fri, 08 Apr 2022 17:43:34 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon Streit Subject: Re: bug#54561: [PATCH 0/4] Add service declarations for Samba References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> <20220408182131.10271-5-simon@netpanic.org> Date: Fri, 08 Apr 2022 23:43:33 +0200 In-Reply-To: <20220408182131.10271-5-simon@netpanic.org> (Simon Streit's message of "Fri, 8 Apr 2022 20:21:30 +0200") Message-ID: <874k339rp6.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Simon Streit skribis: > * gnu/services/samba.scm (): New record. > (wsdd-service-type): New variable. > (wsdd-shepherd-services): New procedure. Just =E2=80=9CNew file.=E2=80=9D and add it to gnu/local.mk. > +(define wsdd-shepherd-service > + (match-lambda > + (($ package ipv4only? ipv6only? chroot hoplimit > + interfaces uuid-device domain hostname > + preserve-case? workgroup) Please use =E2=80=98match-record=E2=80=99 instead; it is less error-prone. > +(define wsdd-service-type > + (service-type > + (name 'wsdd) > + (description "Web Service Discovery Daemon") Please write full sentences in =E2=80=98description=E2=80=99, possibly with= Texinfo markup. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 09 04:29:17 2022 Received: (at 54561) by debbugs.gnu.org; 9 Apr 2022 08:29:18 +0000 Received: from localhost ([127.0.0.1]:36672 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nd6T7-0002uF-Mv for submit@debbugs.gnu.org; Sat, 09 Apr 2022 04:29:17 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:46996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nd6T5-0002u5-ER for 54561@debbugs.gnu.org; Sat, 09 Apr 2022 04:29:16 -0400 Received: from [192.168.109.254] ([188.189.133.86]) by baptiste.telenet-ops.be with bizsmtp id GYVD2700B1s0Pjw01YVD8w; Sat, 09 Apr 2022 10:29:14 +0200 Message-ID: <2b604a916fc1623d82f5e496d310975c8351fe51.camel@telenet.be> Subject: Re: [bug#54561] v2 [PATCH 3/5] doc: Add documentation for WSDD service. From: Maxime Devos To: Simon Streit , 54561@debbugs.gnu.org Date: Sat, 09 Apr 2022 10:29:07 +0200 In-Reply-To: <20220408182131.10271-4-simon@netpanic.org> References: <02c2e04f0ef7404aab26e2c590cf3cd44634c74d.camel@telenet.be> <20220408182131.10271-1-simon@netpanic.org> <20220408182131.10271-4-simon@netpanic.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-OhZSVydwguMuG9OuM454" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1649492954; bh=Y7c2WeA0EWgbM9xD1pgAr39PEPsw9XmuULLpuP6XWqo=; h=Subject:From:To:Date:In-Reply-To:References; b=Q5nXeBtWqBU/2tEc7NglDP70d91xgsQeaMR7f0e29RU5kVIllusy9kuTjrPyypP1L I2nV6/gMuswbR5xLSFDYIbaIDSiyP/XxZD5YzD1FjN1JxUXH8eIkvhfvsMRsmksvBm vRDudt5sbYfUD44hHwDS5qHiTnTYPaoXlPp0uQiKIQJE8GwsRTlMz9DL/DjoWEAhUd IrxYsSJIR6upDIfPcZKZjv9HHcfyvVeKhmBZyzadOOZumtM4eGuG5PoF6lyO4IkeoR IBEQNeM1tlPizLJZzvIPIqC2cI8+411MdIehOHRO1hLBNI+zYYBdgCg8ONWYobyNgm SNBR0HIrXg77A== X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54561 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-OhZSVydwguMuG9OuM454 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Simon Streit schreef op vr 08-04-2022 om 20:21 [+0200]: > +@item @code{hostname} (default: @code{#f}) > +Manually set the hostname rather than letting @command{wsdd} inherit > +this host's hostname. In what format does the DNS name need to be: * with trailing dot: foo.net. * without trailing dot: foo.net * non-punycoded: =C3=A9.net * punycoded: * doesn't matter ? --=-OhZSVydwguMuG9OuM454 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYlFD0xccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7ltxAQD6+2UAu3LufoSvBJ3imZ/xGuw4 NMlgTbRgt08uwkb97wD+L3Dgofs2xipH79B7fdQhlGYFMQgSHfvn2hTfroyEfA8= =RCdr -----END PGP SIGNATURE----- --=-OhZSVydwguMuG9OuM454-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 28 18:23:26 2022 Received: (at 54561) by debbugs.gnu.org; 28 Jul 2022 22:23:26 +0000 Received: from localhost ([127.0.0.1]:59557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBuf-00046c-MB for submit@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:25 -0400 Received: from smtprelay03.ispgateway.de ([80.67.31.30]:20852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBud-00046D-Pu for 54561@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:24 -0400 Received: from [93.195.164.19] (helo=motorball.wh6.home.arpa) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oHBv8-00051z-2G; Fri, 29 Jul 2022 00:23:54 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 1/4] gnu: samba: Add avahi to inputs. Date: Fri, 29 Jul 2022 00:22:12 +0200 Message-Id: <20220728222215.21126-2-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728222215.21126-1-simon@netpanic.org> References: <20220728222215.21126-1-simon@netpanic.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit * gnu/packages/samba.scm (samba) : Add avahi. --- gnu/packages/samba.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index f6ead57cc1..da7d9ef2d3 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020, 2022 Maxim Cournoyer ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ ;;; Copyright © 2022 Guillaume Le Vaillant +;;; Copyright © 2022 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (define-module (gnu packages samba) #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) + #:use-module (gnu packages avahi) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages check) @@ -239,6 +241,7 @@ (define-public samba #:tests? #f)) (inputs (list acl + avahi cmocka cups gamin -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 28 18:23:30 2022 Received: (at 54561) by debbugs.gnu.org; 28 Jul 2022 22:23:30 +0000 Received: from localhost ([127.0.0.1]:59560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBuk-00046y-1y for submit@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:30 -0400 Received: from smtprelay03.ispgateway.de ([80.67.31.30]:17665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBue-00046P-V3 for 54561@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:25 -0400 Received: from [93.195.164.19] (helo=motorball.wh6.home.arpa) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oHBvA-00051z-7L; Fri, 29 Jul 2022 00:23:56 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 3/4] gnu: Add wsdd. Date: Fri, 29 Jul 2022 00:22:14 +0200 Message-Id: <20220728222215.21126-4-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728222215.21126-1-simon@netpanic.org> References: <20220728222215.21126-1-simon@netpanic.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit * gnu/packages/samba.scm (wsdd): New variable. --- gnu/packages/samba.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index da7d9ef2d3..4edcf9c148 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -35,6 +35,7 @@ (define-module (gnu packages samba) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system copy) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (gnu packages) @@ -505,3 +506,30 @@ (define-public ppp license:bsd-4 license:gpl2+ license:public-domain)))) + +(define-public wsdd + (package + (name "wsdd") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/christgau/wsdd") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04an2w6hamnai668ag4vq8x0i09fsg2jrayb4a7ar0x6bn837k7m")))) + (build-system copy-build-system) + (inputs + `(("python" ,python))) + (arguments + '(#:install-plan + '(("src/wsdd.py" "bin/wsdd") + ("man/wsdd.1" "share/man/man1/")))) + (home-page "https://github.com/christgau/wsdd") + (synopsis "A Web Service Discovery host daemon") + (description "This daemon allows (Samba) hosts to be found by Web +Service Dicovery Clients. It also implements the client side of the +discovery protocol which allows to search for devices implementing +WSD.") + (license license:expat))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 28 18:23:31 2022 Received: (at 54561) by debbugs.gnu.org; 28 Jul 2022 22:23:31 +0000 Received: from localhost ([127.0.0.1]:59562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBuk-000470-Dk for submit@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:31 -0400 Received: from smtprelay03.ispgateway.de ([80.67.31.30]:27831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBue-00046F-7A for 54561@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:25 -0400 Received: from [93.195.164.19] (helo=motorball.wh6.home.arpa) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oHBv9-00051z-DA; Fri, 29 Jul 2022 00:23:55 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 2/4] services: Add samba service. Date: Fri, 29 Jul 2022 00:22:13 +0200 Message-Id: <20220728222215.21126-3-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728222215.21126-1-simon@netpanic.org> References: <20220728222215.21126-1-simon@netpanic.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit * doc/guix.texi: Document it. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/local.mk (samba.scm): Add it. * gnu/services/samba.scm: New file. * gnu/tests/samba.scm: New file. * po/guix/POTFILES.in Add it. --- doc/guix.texi | 53 ++++++++++++ gnu/local.mk | 2 + gnu/services/samba.scm | 182 +++++++++++++++++++++++++++++++++++++++++ gnu/tests/samba.scm | 158 +++++++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 1 + 5 files changed, 396 insertions(+) create mode 100644 gnu/services/samba.scm create mode 100644 gnu/tests/samba.scm diff --git a/doc/guix.texi b/doc/guix.texi index 12ecc1b952..614d0a0e03 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -106,6 +106,7 @@ Copyright @copyright{} 2022 Philip M@sup{c}Grath@* Copyright @copyright{} 2022 Karl Hallsby@* Copyright @copyright{} 2022 Justin Veilleux@* Copyright @copyright{} 2022 Reily Siegel@* +Copyright @copyright{} 2022 Simon Streit@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -385,6 +386,7 @@ Services * DNS Services:: DNS daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. +* Samba Services:: Samba services. * Continuous Integration:: Cuirass and Laminar services. * Power Management Services:: Extending battery life. * Audio Services:: The MPD. @@ -17451,6 +17453,7 @@ declaration. * DNS Services:: DNS daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. +* Samba Services:: Samba services. * Continuous Integration:: Cuirass and Laminar services. * Power Management Services:: Extending battery life. * Audio Services:: The MPD. @@ -31194,6 +31197,56 @@ The verbosity level of the daemon. @end table @end deftp +@node Samba Services, Continuous Integration, Network File System, Services +@subsection Samba Services + +@cindex Samba +@cindex SMB +The @code{(gnu services samba)} module provides service definitions for +Samba as well as additional helper services. Currently it provides the +following services. + +@subsubheading Samba + +@uref{https://www.samba.org, Samba} provides network shares for folders +and printers using the SMB/CIFS protocol commonly used on Windows. It +can also act as an Active Directory Domain Controller (AD DC) for other +hosts in an heterougenious network with different types of Computer +systems. + +@defvar {Scheme variable} samba-service-type + +The service type to enable the samba services @code{samba}, @code{nmbd}, +@code{smbd} and @code{winbindd}. By default this service type does not +run as an AD DC, hence @code{samba} remains disabled. + +@end defvar + +@deftp{Data Type} samba-service-configuration +Configuration record for the Samba suite. + +@table @asis +@item @code{package} (default: @code{samba}) +The samba package to use. + +@item @code{config-file} (default: @code{#f}) +The config file to use. + +@item @code{enable-samba?} (default: @code{#f}) +Manually enable the @code{samba} daemon. + +@item @code{enable-smbd?} (default: @code{#f}) +Manually enable the @code{smbd} daemon. + +@item @code{enable-nmbd?} (default: @code{#f}) +Manually enable the @code{nmbd} daemon. + +@item @code{enable-winbindd?} (default: @code{#f}) +Manually enable the @code{winbindd} daemon. + +@end table +@end deftp + @node Continuous Integration @subsection Continuous Integration diff --git a/gnu/local.mk b/gnu/local.mk index 72637761d5..9c1f5ff5b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -676,6 +676,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/herd.scm \ %D%/services/pm.scm \ %D%/services/rsync.scm \ + %D%/services/samba.scm \ %D%/services/sddm.scm \ %D%/services/spice.scm \ %D%/services/ssh.scm \ @@ -754,6 +755,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/package-management.scm \ %D%/tests/reconfigure.scm \ %D%/tests/rsync.scm \ + %D%/tests/samba.scm \ %D%/tests/security-token.scm \ %D%/tests/singularity.scm \ %D%/tests/ssh.scm \ diff --git a/gnu/services/samba.scm b/gnu/services/samba.scm new file mode 100644 index 0000000000..2c9e52a0b0 --- /dev/null +++ b/gnu/services/samba.scm @@ -0,0 +1,182 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Simon Streit +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services samba) + + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages admin) + #:use-module (gnu packages samba) + + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu services shepherd) + #:use-module (gnu services base) + #:use-module (gnu system shadow) + + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix modules) + #:use-module (guix records) + + #:use-module (ice-9 format) + #:use-module (ice-9 match) + #:use-module (ice-9 textual-ports) + #:use-module (srfi srfi-1) + + #:export (samba-service-type + samba-configuration + samba-smb-conf)) + +(define %smb-conf + (plain-file "smb.conf" "[global] + workgroup = WORKGROUP + server string = Samba Server + server role = standalone server + log file = /var/log/samba/log.%m + logging = file +")) + +(define-record-type* + samba-configuration + make-samba-configuration + samba-configuration? + (package samba-configuration-package + (default samba)) + (config-file samba-configuration-config-file + (default #f)) + (enable-samba? samba-configuration-enable-samba? + (default #f)) + (enable-smbd? samba-configuration-enable-smbd? + (default #t)) + (enable-nmbd? samba-configuration-enable-nmbd? + (default #t)) + (enable-winbindd? samba-configuration-enable-winbindd? + (default #t))) + +(define (samba-activation config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (with-imported-modules '((guix build utils)) + (let ((lib-dir "/var/lib/samba") + (log-dir "/var/log/samba") + (run-dir "/var/run/samba") + (lock-dir "/var/lock/samba") + (cache-dir "/var/cache/samba") + (etc-dir "/etc/samba") + (smb.conf "/etc/samba/smb.conf")) + #~(begin + (use-modules (guix build utils)) + (mkdir-p #$etc-dir) + (mkdir-p #$lib-dir) + (mkdir-p/perms (string-append #$lib-dir "/private") + (getpwnam "root") #o700) + (mkdir-p #$log-dir) + (mkdir-p #$run-dir) + (mkdir-p #$lock-dir) + (mkdir-p #$cache-dir) + (copy-file #$config-file #$smb.conf) + (invoke #$(file-append package "/bin/testparm") + "--suppress-prompt" #$smb.conf)))))) + +(define (samba-samba-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run Samba") + (provision '(samba-samba)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/samba") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-nmbd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run NMBD") + (provision '(samba-nmbd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/nmbd") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-smbd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run SMBD") + (provision '(samba-smbd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/smbd") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-winbindd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run Winnbindd for Name Service Switch") + (provision '(samba-winbindd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/winbindd") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-shepherd-services config) + (append (if (samba-configuration-enable-samba? config) + (samba-samba-shepherd-service config) + '()) + (if (samba-configuration-enable-nmbd? config) + (samba-nmbd-shepherd-service config) + '()) + (if (samba-configuration-enable-smbd? config) + (samba-smbd-shepherd-service config) + '()) + (if (samba-configuration-enable-winbindd? config) + (samba-winbindd-shepherd-service config) + '()))) + +(define samba-service-type + (service-type + (name 'samba) + (description "Run @uref{https://www.samba.org/, Samba}, a network file and +print service for all clients using the SMB/CIFS protocol. Samba is an +important component to seamlessly integrate Linux/Unix Servers and Desktops +into Active Directory environments. It can function both as a domain +controller or as a regular domain member.") + (extensions + (list (service-extension shepherd-root-service-type + samba-shepherd-services) + (service-extension activation-service-type + samba-activation) + (service-extension profile-service-type + (compose list samba-configuration-package)))) + (default-value (samba-configuration)))) diff --git a/gnu/tests/samba.scm b/gnu/tests/samba.scm new file mode 100644 index 0000000000..27d7ea49c3 --- /dev/null +++ b/gnu/tests/samba.scm @@ -0,0 +1,158 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Simon Streit +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu tests samba) + #:use-module (gnu tests) + #:use-module (gnu system) + #:use-module (gnu system vm) + #:use-module (gnu services) + #:use-module (gnu services networking) + #:use-module (gnu services samba) + #:use-module (gnu packages samba) + #:use-module (guix gexp) + #:use-module (guix store) + #:export (%test-samba)) + + +;;; +;;; The Samba service. +;;; + +(define %samba-os + (let ((base-os (simple-operating-system + (simple-service 'create-target-directory activation-service-type + #~(begin + (mkdir-p "/srv/samba/guest") + (chown "/srv/samba/guest" + (passwd:uid (getpw "nobody")) + (passwd:gid (getpw "nobody"))))) + (service dhcp-client-service-type) + (service samba-service-type + (samba-configuration + (config-file (plain-file "smb.conf" " +[global] + workgroup = WORKGROUP + server string = Samba Server + server role = standalone server + log file = /var/log/samba/log.%m + logging = file + +[guest] + path = /srv/samba/guest + read only = no + guest ok = yes + guest only = yes +"))))))) + (operating-system + (inherit base-os) + (packages (cons samba (operating-system-packages base-os)))))) + +(define* (run-samba-test) + "Return a test of an OS running Samba service." + + (define vm + (virtual-machine + (operating-system (marionette-operating-system + %samba-os + #:imported-modules '((gnu services herd)))) + (port-forwardings '((8135 . 135) + (8137 . 137) + (8138 . 138) + (8445 . 445))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-26) + (srfi srfi-64)) + + (define marionette + (make-marionette '(#$vm))) + + (test-runner-current (system-test-runner #$output)) + (test-begin "samba") + + (test-assert "samba-smbd running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'samba-smbd)) + marionette)) + + (test-assert "samba-nmbd running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'samba-nmbd)) + marionette)) + + (test-assert "samba-winbindd running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'samba-winbindd)) + marionette)) + + (test-assert "smbd service process id" + (let ((pid + (number->string (wait-for-file "/var/run/samba/smbd.pid" + marionette)))) + (marionette-eval `(file-exists? (string-append "/proc/" ,pid)) + marionette))) + + (test-assert "nmbd service process id" + (let ((pid + (number->string (wait-for-file "/var/run/samba/nmbd.pid" + marionette)))) + (marionette-eval `(file-exists? (string-append "/proc/" ,pid)) + marionette))) + + (test-assert "winbindd service process id" + (let ((pid + (number->string (wait-for-file "/var/run/samba/winbindd.pid" + marionette)))) + (marionette-eval `(file-exists? (string-append "/proc/" ,pid)) + marionette))) + + (test-assert "samba-smbd is listening for peers" + (wait-for-tcp-port 445 marionette)) + + (test-equal "smbclient connect" + 0 + (marionette-eval + '(system* #$(file-append samba "/bin/smbclient") + "--list=localhost" "--no-pass") + marionette)) + + (test-equal "smbclient connect" + 0 + (marionette-eval + '(system* #$(file-append samba "/bin/smbclient") + "--list=localhost" "--no-pass") + marionette)) + + (test-end)))) + + (gexp->derivation "samba-test" test)) + +(define %test-samba + (system-test + (name "samba") + (description "Connect to a running Samba daemon.") + (value (run-samba-test)))) diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index f50dd00422..9088a627ff 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -6,6 +6,7 @@ gnu/services.scm gnu/system.scm gnu/services/configuration.scm gnu/services/shepherd.scm +gnu/services/samba.scm gnu/home/services.scm gnu/home/services/ssh.scm gnu/home/services/symlink-manager.scm -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 28 18:23:32 2022 Received: (at 54561) by debbugs.gnu.org; 28 Jul 2022 22:23:32 +0000 Received: from localhost ([127.0.0.1]:59564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBum-00047A-GT for submit@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:32 -0400 Received: from smtprelay03.ispgateway.de ([80.67.31.30]:37421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBuc-00046A-9f for 54561@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:26 -0400 Received: from [93.195.164.19] (helo=motorball.wh6.home.arpa) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oHBv5-00051z-EH; Fri, 29 Jul 2022 00:23:51 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 0/4] Add samba and wsdd to services list. Date: Fri, 29 Jul 2022 00:22:11 +0200 Message-Id: <20220728222215.21126-1-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit Hello, here my third iteration preparing this patch series. Now there are tests included too. There is a slight modification in samba's package declaration to include avahi as a dependency. Samba uses avahi to advertise instances to other hosts that understand mDNS through avahi. Simon Streit (4): gnu: samba: Add avahi to inputs. services: Add samba service. gnu: Add wsdd. services: Add wsdd service. doc/guix.texi | 122 ++++++++++++++++++ gnu/local.mk | 2 + gnu/packages/samba.scm | 31 +++++ gnu/services/samba.scm | 285 +++++++++++++++++++++++++++++++++++++++++ gnu/tests/samba.scm | 217 +++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 1 + 6 files changed, 658 insertions(+) create mode 100644 gnu/services/samba.scm create mode 100644 gnu/tests/samba.scm -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jul 28 18:23:33 2022 Received: (at 54561) by debbugs.gnu.org; 28 Jul 2022 22:23:33 +0000 Received: from localhost ([127.0.0.1]:59566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBum-00047H-On for submit@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:33 -0400 Received: from smtprelay03.ispgateway.de ([80.67.31.30]:37067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oHBuf-00046X-Re for 54561@debbugs.gnu.org; Thu, 28 Jul 2022 18:23:26 -0400 Received: from [93.195.164.19] (helo=motorball.wh6.home.arpa) by smtprelay03.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oHBvB-00051z-36; Fri, 29 Jul 2022 00:23:57 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 4/4] services: Add wsdd service. Date: Fri, 29 Jul 2022 00:22:15 +0200 Message-Id: <20220728222215.21126-5-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728222215.21126-1-simon@netpanic.org> References: <20220728222215.21126-1-simon@netpanic.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit * doc/guix.texi: Add documentation for wsdd service. * gnu/services/samba.scm (): New record. (wsdd-service-type): New variable. (wsdd-shepherd-services): New procedure. * gnu/tests/samba.scm: wsdd test. --- doc/guix.texi | 69 +++++++++++++++++++++++++++ gnu/services/samba.scm | 105 ++++++++++++++++++++++++++++++++++++++++- gnu/tests/samba.scm | 61 +++++++++++++++++++++++- 3 files changed, 233 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 614d0a0e03..c168f063c3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31247,6 +31247,75 @@ Manually enable the @code{winbindd} daemon. @end table @end deftp +@cindex wsdd +@subsubheading Web Service Discovery Daemon + +Web Service Discovery Daemon implements +@uref{http://docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-spec-os.html, +Web Services Dynamic Discovery} protocol that enables host discovery -- +similar to Avahi -- over Multicast DNS. It is a drop-in replacement for +SMB hosts that have had SMBv1 disabled for security reasons. + +@defvr {Scheme Variable} wsdd-service-type + +Service type for the WSD host daemon. The value for +this service type is a @code{wsdd-configuration} record. The details +for the @code{wsdd-configuration} record type are given below. +@end defvr + +@deftp{Data Type} wsdd-configuration This data type represents the +configuration for the wsdd service. + +@table @asis + +@item @code{package} (default: @code{wsdd}) +The wsdd package to use. + +@item @code{ipv4only?} (default: @code{#f}) +Only listen to IPv4 addresses. + +@item @code{ipv6only} (default: @code{#f}) +Only listen to IPv6 addresses. Please note: Activating both options is +not possible, since there would be no IP versions to listen to. + +@item @code{chroot} (default: @code{#f}) +Chroot into a separate directory to prevent access to other directories. +This is to increase security in case there is a vulnerability in +@command{wsdd}. + +@item @code{hop-limit} (default: @code{1}) +Limit to the level of hops for multicast packets. The default is +@var{1} which should prevent packets from leaving the local network. + +@item @code{interface} (default: @code{'()}) +Limit to the given list of interfaces to listen to. By default wsdd +will listen to all interfaces. Except the loopback interface is never +used. + +@item @code{uuid-device} (default: @code{#f}) +The WSD protocol requires a device to have a UUID. Set this to manually +assign the service a UUID. + +@item @code{domain} (default: @code{#f}) +Notify this host is a member of an Active Directory. + +@item @code{host-name} (default: @code{#f}) +Manually set the hostname rather than letting @command{wsdd} inherit +this host's hostname. Only the host name part of a possible FQDN will +be used in the default case. + +@item @code{preserve-case?} (default: @code{#f}) +By default @command{wsdd} will convert the hostname in workgroup to all +uppercase. The opposite is true for hostnames in domains. Setting this +parameter will preserve case. + +@item @code{workgroup} (default: @var{"WORKGROUP"}) +Change the name of the workgroup. By default @command{wsdd} reports +this host being member of a workgroup. + +@end table +@end deftp + @node Continuous Integration @subsection Continuous Integration diff --git a/gnu/services/samba.scm b/gnu/services/samba.scm index 2c9e52a0b0..c1f9033d63 100644 --- a/gnu/services/samba.scm +++ b/gnu/services/samba.scm @@ -41,7 +41,10 @@ (define-module (gnu services samba) #:export (samba-service-type samba-configuration - samba-smb-conf)) + samba-smb-conf + + wsdd-service-type + wsdd-configuration)) (define %smb-conf (plain-file "smb.conf" "[global] @@ -180,3 +183,103 @@ (define samba-service-type (service-extension profile-service-type (compose list samba-configuration-package)))) (default-value (samba-configuration)))) + + +;;; +;;; WSDD +;;; + +(define-record-type* + wsdd-configuration + make-wsdd-configuration + wsdd-configuration? + (package wsdd-configuration-package + (default wsdd)) + (ipv4only? wsdd-configuration-ipv4only? + (default #f)) + (ipv6only? wsdd-configuration-ipv6only? + (default #f)) + (chroot wsdd-configuration-chroot + (default #f)) + (hoplimit wsdd-configuration-hoplimit + (default 1)) + (interfaces wsdd-configuration-interfaces + (default '())) + (uuid-device wsdd-configuration-uuid-device + (default #f)) + (domain wsdd-configuration-domain + (default #f)) + (hostname wsdd-configuration-hostname + (default #f)) + (preserve-case? wsdd-configuration-preserve-case? + (default #f)) + (workgroup wsdd-configuration-workgroup + (default "WORKGROUP"))) + +(define wsdd-accounts + (list + (user-group (name "wsdd")) + (user-account (name "wsdd") + (group "wsdd") + (comment "Web Service Discovery user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))) + +(define wsdd-shepherd-service + (match-lambda + (($ package ipv4only? ipv6only? chroot hoplimit + interfaces uuid-device domain hostname + preserve-case? workgroup) + (list (shepherd-service + (documentation "Run a Web Service Discovery service") + (provision '(wsdd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/bin/wsdd") + #$@(if ipv4only? + #~("--ipv4only") + '()) + #$@(if ipv6only? + #~("--ipv6only") + '()) + #$@(if chroot + #~("--chroot" #$chroot) + '()) + #$@(if hoplimit + #~("--hoplimit" #$(number->string hoplimit)) + '()) + #$@(map (lambda (interfaces) + (string-append "--interface=" interfaces)) + interfaces) + #$@(if uuid-device + #~("--uuid" #$uuid-device) + '()) + #$@(if domain + #~("--domain" #$domain) + '()) + #$@(if hostname + #~("--hostname" #$hostname) + '()) + #$@(if preserve-case? + #~("--preserve-case") + '()) + #$@(if workgroup + #~("--workgroup" #$workgroup) + '())) + #:user "wsdd" + #:group "wsdd" + #:log-file "/var/log/wsdd.log")) + (stop #~(make-kill-destructor))))))) + +(define wsdd-service-type + (service-type + (name 'wsdd) + (description "Web Service Discovery Daemon") + (extensions + (list (service-extension shepherd-root-service-type + wsdd-shepherd-service) + (service-extension account-service-type + (const wsdd-accounts)) + (service-extension profile-service-type + (compose list wsdd-configuration-package)))) + (default-value (wsdd-configuration)))) diff --git a/gnu/tests/samba.scm b/gnu/tests/samba.scm index 27d7ea49c3..6b065cd5de 100644 --- a/gnu/tests/samba.scm +++ b/gnu/tests/samba.scm @@ -26,7 +26,8 @@ (define-module (gnu tests samba) #:use-module (gnu packages samba) #:use-module (guix gexp) #:use-module (guix store) - #:export (%test-samba)) + #:export (%test-samba + %test-wsdd)) ;;; @@ -156,3 +157,61 @@ (define %test-samba (name "samba") (description "Connect to a running Samba daemon.") (value (run-samba-test)))) + + +;;; +;;; The wsdd service. +;;; + +(define %wsdd-os + (let ((base-os (simple-operating-system + (service dhcp-client-service-type) + (service wsdd-service-type)))) + (operating-system + (inherit base-os) + (packages (cons wsdd (operating-system-packages base-os)))))) + +(define* (run-wsdd-test) + "Return a test of an OS running wsdd service." + + (define vm + (virtual-machine + (operating-system (marionette-operating-system + %wsdd-os + #:imported-modules '((gnu services herd)))) + (port-forwardings '((8135 . 135) + (8137 . 137) + (8138 . 138) + (8445 . 445))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-26) + (srfi srfi-64)) + + (define marionette + (make-marionette '(#$vm))) + + (test-runner-current (system-test-runner #$output)) + (test-begin "wsdd") + + ;; Here shall be more tests to begin with. + + (test-assert "wsdd running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'wsdd)) + marionette)) + + (test-end)))) + + (gexp->derivation "samba-test" test)) + +(define %test-wsdd + (system-test + (name "wsdd") + (description "Connect to a running wsdd daemon.") + (value (run-wsdd-test)))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 08 10:56:57 2022 Received: (at 54561) by debbugs.gnu.org; 8 Aug 2022 14:56:57 +0000 Received: from localhost ([127.0.0.1]:41494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4Bc-0004ec-Dk for submit@debbugs.gnu.org; Mon, 08 Aug 2022 10:56:56 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.35]:47220) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4BX-0004eM-N0 for 54561@debbugs.gnu.org; Mon, 08 Aug 2022 10:56:55 -0400 Received: from [79.252.144.136] (helo=motorball.wh6.home.arpa) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oL4CV-000256-Pz; Mon, 08 Aug 2022 16:57:51 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 0/4] Add samba and wsdd to services list. Date: Mon, 8 Aug 2022 16:56:39 +0200 Message-Id: <20220808145643.3445-1-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit Hello, here my third iteration preparing this patch series. Now there are tests included too. There is a slight modification in samba's package declaration to include avahi as a dependency. Samba uses avahi to advertise instances to other hosts that understand mDNS through avahi. Simon Streit (4): gnu: samba: Add avahi to inputs. services: Add samba service. gnu: Add wsdd. services: Add wsdd service. doc/guix.texi | 122 ++++++++++++++++++ gnu/local.mk | 2 + gnu/packages/samba.scm | 31 +++++ gnu/services/samba.scm | 285 +++++++++++++++++++++++++++++++++++++++++ gnu/tests/samba.scm | 217 +++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 1 + 6 files changed, 658 insertions(+) create mode 100644 gnu/services/samba.scm create mode 100644 gnu/tests/samba.scm -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 08 10:57:00 2022 Received: (at 54561) by debbugs.gnu.org; 8 Aug 2022 14:57:00 +0000 Received: from localhost ([127.0.0.1]:41497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4Bf-0004f3-1i for submit@debbugs.gnu.org; Mon, 08 Aug 2022 10:57:00 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.35]:7767) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4Bb-0004eU-4i for 54561@debbugs.gnu.org; Mon, 08 Aug 2022 10:56:56 -0400 Received: from [79.252.144.136] (helo=motorball.wh6.home.arpa) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oL4Ca-000256-Gl; Mon, 08 Aug 2022 16:57:56 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 2/4] services: Add samba service. Date: Mon, 8 Aug 2022 16:56:41 +0200 Message-Id: <20220808145643.3445-3-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808145643.3445-1-simon@netpanic.org> References: <20220808145643.3445-1-simon@netpanic.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit * doc/guix.texi: Document it. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/local.mk (samba.scm): Add it. * gnu/services/samba.scm: New file. * gnu/tests/samba.scm: New file. * po/guix/POTFILES.in Add it. --- doc/guix.texi | 53 ++++++++++++ gnu/local.mk | 2 + gnu/services/samba.scm | 182 +++++++++++++++++++++++++++++++++++++++++ gnu/tests/samba.scm | 158 +++++++++++++++++++++++++++++++++++ po/guix/POTFILES.in | 1 + 5 files changed, 396 insertions(+) create mode 100644 gnu/services/samba.scm create mode 100644 gnu/tests/samba.scm diff --git a/doc/guix.texi b/doc/guix.texi index 12ecc1b952..614d0a0e03 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -106,6 +106,7 @@ Copyright @copyright{} 2022 Philip M@sup{c}Grath@* Copyright @copyright{} 2022 Karl Hallsby@* Copyright @copyright{} 2022 Justin Veilleux@* Copyright @copyright{} 2022 Reily Siegel@* +Copyright @copyright{} 2022 Simon Streit@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -385,6 +386,7 @@ Services * DNS Services:: DNS daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. +* Samba Services:: Samba services. * Continuous Integration:: Cuirass and Laminar services. * Power Management Services:: Extending battery life. * Audio Services:: The MPD. @@ -17451,6 +17453,7 @@ declaration. * DNS Services:: DNS daemons. * VPN Services:: VPN daemons. * Network File System:: NFS related services. +* Samba Services:: Samba services. * Continuous Integration:: Cuirass and Laminar services. * Power Management Services:: Extending battery life. * Audio Services:: The MPD. @@ -31194,6 +31197,56 @@ The verbosity level of the daemon. @end table @end deftp +@node Samba Services, Continuous Integration, Network File System, Services +@subsection Samba Services + +@cindex Samba +@cindex SMB +The @code{(gnu services samba)} module provides service definitions for +Samba as well as additional helper services. Currently it provides the +following services. + +@subsubheading Samba + +@uref{https://www.samba.org, Samba} provides network shares for folders +and printers using the SMB/CIFS protocol commonly used on Windows. It +can also act as an Active Directory Domain Controller (AD DC) for other +hosts in an heterougenious network with different types of Computer +systems. + +@defvar {Scheme variable} samba-service-type + +The service type to enable the samba services @code{samba}, @code{nmbd}, +@code{smbd} and @code{winbindd}. By default this service type does not +run as an AD DC, hence @code{samba} remains disabled. + +@end defvar + +@deftp{Data Type} samba-service-configuration +Configuration record for the Samba suite. + +@table @asis +@item @code{package} (default: @code{samba}) +The samba package to use. + +@item @code{config-file} (default: @code{#f}) +The config file to use. + +@item @code{enable-samba?} (default: @code{#f}) +Manually enable the @code{samba} daemon. + +@item @code{enable-smbd?} (default: @code{#f}) +Manually enable the @code{smbd} daemon. + +@item @code{enable-nmbd?} (default: @code{#f}) +Manually enable the @code{nmbd} daemon. + +@item @code{enable-winbindd?} (default: @code{#f}) +Manually enable the @code{winbindd} daemon. + +@end table +@end deftp + @node Continuous Integration @subsection Continuous Integration diff --git a/gnu/local.mk b/gnu/local.mk index 72637761d5..9c1f5ff5b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -676,6 +676,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/herd.scm \ %D%/services/pm.scm \ %D%/services/rsync.scm \ + %D%/services/samba.scm \ %D%/services/sddm.scm \ %D%/services/spice.scm \ %D%/services/ssh.scm \ @@ -754,6 +755,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/package-management.scm \ %D%/tests/reconfigure.scm \ %D%/tests/rsync.scm \ + %D%/tests/samba.scm \ %D%/tests/security-token.scm \ %D%/tests/singularity.scm \ %D%/tests/ssh.scm \ diff --git a/gnu/services/samba.scm b/gnu/services/samba.scm new file mode 100644 index 0000000000..2c9e52a0b0 --- /dev/null +++ b/gnu/services/samba.scm @@ -0,0 +1,182 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Simon Streit +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu services samba) + + #:use-module (gnu packages) + #:use-module (gnu packages base) + #:use-module (gnu packages admin) + #:use-module (gnu packages samba) + + #:use-module (gnu services) + #:use-module (gnu services configuration) + #:use-module (gnu services shepherd) + #:use-module (gnu services base) + #:use-module (gnu system shadow) + + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (guix modules) + #:use-module (guix records) + + #:use-module (ice-9 format) + #:use-module (ice-9 match) + #:use-module (ice-9 textual-ports) + #:use-module (srfi srfi-1) + + #:export (samba-service-type + samba-configuration + samba-smb-conf)) + +(define %smb-conf + (plain-file "smb.conf" "[global] + workgroup = WORKGROUP + server string = Samba Server + server role = standalone server + log file = /var/log/samba/log.%m + logging = file +")) + +(define-record-type* + samba-configuration + make-samba-configuration + samba-configuration? + (package samba-configuration-package + (default samba)) + (config-file samba-configuration-config-file + (default #f)) + (enable-samba? samba-configuration-enable-samba? + (default #f)) + (enable-smbd? samba-configuration-enable-smbd? + (default #t)) + (enable-nmbd? samba-configuration-enable-nmbd? + (default #t)) + (enable-winbindd? samba-configuration-enable-winbindd? + (default #t))) + +(define (samba-activation config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (with-imported-modules '((guix build utils)) + (let ((lib-dir "/var/lib/samba") + (log-dir "/var/log/samba") + (run-dir "/var/run/samba") + (lock-dir "/var/lock/samba") + (cache-dir "/var/cache/samba") + (etc-dir "/etc/samba") + (smb.conf "/etc/samba/smb.conf")) + #~(begin + (use-modules (guix build utils)) + (mkdir-p #$etc-dir) + (mkdir-p #$lib-dir) + (mkdir-p/perms (string-append #$lib-dir "/private") + (getpwnam "root") #o700) + (mkdir-p #$log-dir) + (mkdir-p #$run-dir) + (mkdir-p #$lock-dir) + (mkdir-p #$cache-dir) + (copy-file #$config-file #$smb.conf) + (invoke #$(file-append package "/bin/testparm") + "--suppress-prompt" #$smb.conf)))))) + +(define (samba-samba-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run Samba") + (provision '(samba-samba)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/samba") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-nmbd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run NMBD") + (provision '(samba-nmbd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/nmbd") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-smbd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run SMBD") + (provision '(samba-smbd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/smbd") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-winbindd-shepherd-service config) + (let ((package (samba-configuration-package config)) + (config-file (samba-configuration-config-file config))) + (list (shepherd-service + (documentation "Run Winnbindd for Name Service Switch") + (provision '(samba-winbindd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/sbin/winbindd") + (string-append "--configfile=" #$config-file) + "--foreground" + "--no-process-group"))) + (stop #~(make-kill-destructor)))))) + +(define (samba-shepherd-services config) + (append (if (samba-configuration-enable-samba? config) + (samba-samba-shepherd-service config) + '()) + (if (samba-configuration-enable-nmbd? config) + (samba-nmbd-shepherd-service config) + '()) + (if (samba-configuration-enable-smbd? config) + (samba-smbd-shepherd-service config) + '()) + (if (samba-configuration-enable-winbindd? config) + (samba-winbindd-shepherd-service config) + '()))) + +(define samba-service-type + (service-type + (name 'samba) + (description "Run @uref{https://www.samba.org/, Samba}, a network file and +print service for all clients using the SMB/CIFS protocol. Samba is an +important component to seamlessly integrate Linux/Unix Servers and Desktops +into Active Directory environments. It can function both as a domain +controller or as a regular domain member.") + (extensions + (list (service-extension shepherd-root-service-type + samba-shepherd-services) + (service-extension activation-service-type + samba-activation) + (service-extension profile-service-type + (compose list samba-configuration-package)))) + (default-value (samba-configuration)))) diff --git a/gnu/tests/samba.scm b/gnu/tests/samba.scm new file mode 100644 index 0000000000..27d7ea49c3 --- /dev/null +++ b/gnu/tests/samba.scm @@ -0,0 +1,158 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Simon Streit +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu tests samba) + #:use-module (gnu tests) + #:use-module (gnu system) + #:use-module (gnu system vm) + #:use-module (gnu services) + #:use-module (gnu services networking) + #:use-module (gnu services samba) + #:use-module (gnu packages samba) + #:use-module (guix gexp) + #:use-module (guix store) + #:export (%test-samba)) + + +;;; +;;; The Samba service. +;;; + +(define %samba-os + (let ((base-os (simple-operating-system + (simple-service 'create-target-directory activation-service-type + #~(begin + (mkdir-p "/srv/samba/guest") + (chown "/srv/samba/guest" + (passwd:uid (getpw "nobody")) + (passwd:gid (getpw "nobody"))))) + (service dhcp-client-service-type) + (service samba-service-type + (samba-configuration + (config-file (plain-file "smb.conf" " +[global] + workgroup = WORKGROUP + server string = Samba Server + server role = standalone server + log file = /var/log/samba/log.%m + logging = file + +[guest] + path = /srv/samba/guest + read only = no + guest ok = yes + guest only = yes +"))))))) + (operating-system + (inherit base-os) + (packages (cons samba (operating-system-packages base-os)))))) + +(define* (run-samba-test) + "Return a test of an OS running Samba service." + + (define vm + (virtual-machine + (operating-system (marionette-operating-system + %samba-os + #:imported-modules '((gnu services herd)))) + (port-forwardings '((8135 . 135) + (8137 . 137) + (8138 . 138) + (8445 . 445))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-26) + (srfi srfi-64)) + + (define marionette + (make-marionette '(#$vm))) + + (test-runner-current (system-test-runner #$output)) + (test-begin "samba") + + (test-assert "samba-smbd running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'samba-smbd)) + marionette)) + + (test-assert "samba-nmbd running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'samba-nmbd)) + marionette)) + + (test-assert "samba-winbindd running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'samba-winbindd)) + marionette)) + + (test-assert "smbd service process id" + (let ((pid + (number->string (wait-for-file "/var/run/samba/smbd.pid" + marionette)))) + (marionette-eval `(file-exists? (string-append "/proc/" ,pid)) + marionette))) + + (test-assert "nmbd service process id" + (let ((pid + (number->string (wait-for-file "/var/run/samba/nmbd.pid" + marionette)))) + (marionette-eval `(file-exists? (string-append "/proc/" ,pid)) + marionette))) + + (test-assert "winbindd service process id" + (let ((pid + (number->string (wait-for-file "/var/run/samba/winbindd.pid" + marionette)))) + (marionette-eval `(file-exists? (string-append "/proc/" ,pid)) + marionette))) + + (test-assert "samba-smbd is listening for peers" + (wait-for-tcp-port 445 marionette)) + + (test-equal "smbclient connect" + 0 + (marionette-eval + '(system* #$(file-append samba "/bin/smbclient") + "--list=localhost" "--no-pass") + marionette)) + + (test-equal "smbclient connect" + 0 + (marionette-eval + '(system* #$(file-append samba "/bin/smbclient") + "--list=localhost" "--no-pass") + marionette)) + + (test-end)))) + + (gexp->derivation "samba-test" test)) + +(define %test-samba + (system-test + (name "samba") + (description "Connect to a running Samba daemon.") + (value (run-samba-test)))) diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index f50dd00422..9088a627ff 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -6,6 +6,7 @@ gnu/services.scm gnu/system.scm gnu/services/configuration.scm gnu/services/shepherd.scm +gnu/services/samba.scm gnu/home/services.scm gnu/home/services/ssh.scm gnu/home/services/symlink-manager.scm -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 08 10:57:02 2022 Received: (at 54561) by debbugs.gnu.org; 8 Aug 2022 14:57:02 +0000 Received: from localhost ([127.0.0.1]:41500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4Bi-0004fP-5t for submit@debbugs.gnu.org; Mon, 08 Aug 2022 10:57:02 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.35]:1793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4BZ-0004eS-NH for 54561@debbugs.gnu.org; Mon, 08 Aug 2022 10:56:58 -0400 Received: from [79.252.144.136] (helo=motorball.wh6.home.arpa) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oL4CZ-000256-25; Mon, 08 Aug 2022 16:57:55 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 1/4] gnu: samba: Add avahi to inputs. Date: Mon, 8 Aug 2022 16:56:40 +0200 Message-Id: <20220808145643.3445-2-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808145643.3445-1-simon@netpanic.org> References: <20220808145643.3445-1-simon@netpanic.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit * gnu/packages/samba.scm (samba) : Add avahi. --- gnu/packages/samba.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index f6ead57cc1..da7d9ef2d3 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020, 2022 Maxim Cournoyer ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ ;;; Copyright © 2022 Guillaume Le Vaillant +;;; Copyright © 2022 Simon Streit ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (define-module (gnu packages samba) #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) + #:use-module (gnu packages avahi) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages check) @@ -239,6 +241,7 @@ (define-public samba #:tests? #f)) (inputs (list acl + avahi cmocka cups gamin -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 08 10:57:03 2022 Received: (at 54561) by debbugs.gnu.org; 8 Aug 2022 14:57:03 +0000 Received: from localhost ([127.0.0.1]:41502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4Bi-0004fT-JZ for submit@debbugs.gnu.org; Mon, 08 Aug 2022 10:57:03 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.35]:16293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4Be-0004er-By for 54561@debbugs.gnu.org; Mon, 08 Aug 2022 10:56:58 -0400 Received: from [79.252.144.136] (helo=motorball.wh6.home.arpa) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oL4Cd-000256-Py; Mon, 08 Aug 2022 16:57:59 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 3/4] gnu: Add wsdd. Date: Mon, 8 Aug 2022 16:56:42 +0200 Message-Id: <20220808145643.3445-4-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808145643.3445-1-simon@netpanic.org> References: <20220808145643.3445-1-simon@netpanic.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit * gnu/packages/samba.scm (wsdd): New variable. --- gnu/packages/samba.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index da7d9ef2d3..4edcf9c148 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -35,6 +35,7 @@ (define-module (gnu packages samba) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix build-system copy) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (gnu packages) @@ -505,3 +506,30 @@ (define-public ppp license:bsd-4 license:gpl2+ license:public-domain)))) + +(define-public wsdd + (package + (name "wsdd") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/christgau/wsdd") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04an2w6hamnai668ag4vq8x0i09fsg2jrayb4a7ar0x6bn837k7m")))) + (build-system copy-build-system) + (inputs + `(("python" ,python))) + (arguments + '(#:install-plan + '(("src/wsdd.py" "bin/wsdd") + ("man/wsdd.1" "share/man/man1/")))) + (home-page "https://github.com/christgau/wsdd") + (synopsis "A Web Service Discovery host daemon") + (description "This daemon allows (Samba) hosts to be found by Web +Service Dicovery Clients. It also implements the client side of the +discovery protocol which allows to search for devices implementing +WSD.") + (license license:expat))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 08 10:57:05 2022 Received: (at 54561) by debbugs.gnu.org; 8 Aug 2022 14:57:05 +0000 Received: from localhost ([127.0.0.1]:41508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4Bl-0004gJ-3T for submit@debbugs.gnu.org; Mon, 08 Aug 2022 10:57:05 -0400 Received: from smtprelay01.ispgateway.de ([80.67.31.35]:14405) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4Bg-0004fB-Lk for 54561@debbugs.gnu.org; Mon, 08 Aug 2022 10:57:01 -0400 Received: from [79.252.144.136] (helo=motorball.wh6.home.arpa) by smtprelay01.ispgateway.de with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94.2) (envelope-from ) id 1oL4Cg-000256-0s; Mon, 08 Aug 2022 16:58:02 +0200 From: simon@netpanic.org To: 54561@debbugs.gnu.org Subject: [PATCH v3 4/4] services: Add wsdd service. Date: Mon, 8 Aug 2022 16:56:43 +0200 Message-Id: <20220808145643.3445-5-simon@netpanic.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220808145643.3445-1-simon@netpanic.org> References: <20220808145643.3445-1-simon@netpanic.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Df-Sender: c2ltb25AbmV0cGFuaWMub3Jn X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 54561 Cc: Simon Streit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Simon Streit * doc/guix.texi: Add documentation for wsdd service. * gnu/services/samba.scm (): New record. (wsdd-service-type): New variable. (wsdd-shepherd-services): New procedure. * gnu/tests/samba.scm: wsdd test. --- doc/guix.texi | 69 +++++++++++++++++++++++++++ gnu/services/samba.scm | 105 ++++++++++++++++++++++++++++++++++++++++- gnu/tests/samba.scm | 61 +++++++++++++++++++++++- 3 files changed, 233 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 614d0a0e03..c168f063c3 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31247,6 +31247,75 @@ Manually enable the @code{winbindd} daemon. @end table @end deftp +@cindex wsdd +@subsubheading Web Service Discovery Daemon + +Web Service Discovery Daemon implements +@uref{http://docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-spec-os.html, +Web Services Dynamic Discovery} protocol that enables host discovery -- +similar to Avahi -- over Multicast DNS. It is a drop-in replacement for +SMB hosts that have had SMBv1 disabled for security reasons. + +@defvr {Scheme Variable} wsdd-service-type + +Service type for the WSD host daemon. The value for +this service type is a @code{wsdd-configuration} record. The details +for the @code{wsdd-configuration} record type are given below. +@end defvr + +@deftp{Data Type} wsdd-configuration This data type represents the +configuration for the wsdd service. + +@table @asis + +@item @code{package} (default: @code{wsdd}) +The wsdd package to use. + +@item @code{ipv4only?} (default: @code{#f}) +Only listen to IPv4 addresses. + +@item @code{ipv6only} (default: @code{#f}) +Only listen to IPv6 addresses. Please note: Activating both options is +not possible, since there would be no IP versions to listen to. + +@item @code{chroot} (default: @code{#f}) +Chroot into a separate directory to prevent access to other directories. +This is to increase security in case there is a vulnerability in +@command{wsdd}. + +@item @code{hop-limit} (default: @code{1}) +Limit to the level of hops for multicast packets. The default is +@var{1} which should prevent packets from leaving the local network. + +@item @code{interface} (default: @code{'()}) +Limit to the given list of interfaces to listen to. By default wsdd +will listen to all interfaces. Except the loopback interface is never +used. + +@item @code{uuid-device} (default: @code{#f}) +The WSD protocol requires a device to have a UUID. Set this to manually +assign the service a UUID. + +@item @code{domain} (default: @code{#f}) +Notify this host is a member of an Active Directory. + +@item @code{host-name} (default: @code{#f}) +Manually set the hostname rather than letting @command{wsdd} inherit +this host's hostname. Only the host name part of a possible FQDN will +be used in the default case. + +@item @code{preserve-case?} (default: @code{#f}) +By default @command{wsdd} will convert the hostname in workgroup to all +uppercase. The opposite is true for hostnames in domains. Setting this +parameter will preserve case. + +@item @code{workgroup} (default: @var{"WORKGROUP"}) +Change the name of the workgroup. By default @command{wsdd} reports +this host being member of a workgroup. + +@end table +@end deftp + @node Continuous Integration @subsection Continuous Integration diff --git a/gnu/services/samba.scm b/gnu/services/samba.scm index 2c9e52a0b0..c1f9033d63 100644 --- a/gnu/services/samba.scm +++ b/gnu/services/samba.scm @@ -41,7 +41,10 @@ (define-module (gnu services samba) #:export (samba-service-type samba-configuration - samba-smb-conf)) + samba-smb-conf + + wsdd-service-type + wsdd-configuration)) (define %smb-conf (plain-file "smb.conf" "[global] @@ -180,3 +183,103 @@ (define samba-service-type (service-extension profile-service-type (compose list samba-configuration-package)))) (default-value (samba-configuration)))) + + +;;; +;;; WSDD +;;; + +(define-record-type* + wsdd-configuration + make-wsdd-configuration + wsdd-configuration? + (package wsdd-configuration-package + (default wsdd)) + (ipv4only? wsdd-configuration-ipv4only? + (default #f)) + (ipv6only? wsdd-configuration-ipv6only? + (default #f)) + (chroot wsdd-configuration-chroot + (default #f)) + (hoplimit wsdd-configuration-hoplimit + (default 1)) + (interfaces wsdd-configuration-interfaces + (default '())) + (uuid-device wsdd-configuration-uuid-device + (default #f)) + (domain wsdd-configuration-domain + (default #f)) + (hostname wsdd-configuration-hostname + (default #f)) + (preserve-case? wsdd-configuration-preserve-case? + (default #f)) + (workgroup wsdd-configuration-workgroup + (default "WORKGROUP"))) + +(define wsdd-accounts + (list + (user-group (name "wsdd")) + (user-account (name "wsdd") + (group "wsdd") + (comment "Web Service Discovery user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))) + +(define wsdd-shepherd-service + (match-lambda + (($ package ipv4only? ipv6only? chroot hoplimit + interfaces uuid-device domain hostname + preserve-case? workgroup) + (list (shepherd-service + (documentation "Run a Web Service Discovery service") + (provision '(wsdd)) + (requirement '(networking)) + (start #~(make-forkexec-constructor + (list #$(file-append package "/bin/wsdd") + #$@(if ipv4only? + #~("--ipv4only") + '()) + #$@(if ipv6only? + #~("--ipv6only") + '()) + #$@(if chroot + #~("--chroot" #$chroot) + '()) + #$@(if hoplimit + #~("--hoplimit" #$(number->string hoplimit)) + '()) + #$@(map (lambda (interfaces) + (string-append "--interface=" interfaces)) + interfaces) + #$@(if uuid-device + #~("--uuid" #$uuid-device) + '()) + #$@(if domain + #~("--domain" #$domain) + '()) + #$@(if hostname + #~("--hostname" #$hostname) + '()) + #$@(if preserve-case? + #~("--preserve-case") + '()) + #$@(if workgroup + #~("--workgroup" #$workgroup) + '())) + #:user "wsdd" + #:group "wsdd" + #:log-file "/var/log/wsdd.log")) + (stop #~(make-kill-destructor))))))) + +(define wsdd-service-type + (service-type + (name 'wsdd) + (description "Web Service Discovery Daemon") + (extensions + (list (service-extension shepherd-root-service-type + wsdd-shepherd-service) + (service-extension account-service-type + (const wsdd-accounts)) + (service-extension profile-service-type + (compose list wsdd-configuration-package)))) + (default-value (wsdd-configuration)))) diff --git a/gnu/tests/samba.scm b/gnu/tests/samba.scm index 27d7ea49c3..6b065cd5de 100644 --- a/gnu/tests/samba.scm +++ b/gnu/tests/samba.scm @@ -26,7 +26,8 @@ (define-module (gnu tests samba) #:use-module (gnu packages samba) #:use-module (guix gexp) #:use-module (guix store) - #:export (%test-samba)) + #:export (%test-samba + %test-wsdd)) ;;; @@ -156,3 +157,61 @@ (define %test-samba (name "samba") (description "Connect to a running Samba daemon.") (value (run-samba-test)))) + + +;;; +;;; The wsdd service. +;;; + +(define %wsdd-os + (let ((base-os (simple-operating-system + (service dhcp-client-service-type) + (service wsdd-service-type)))) + (operating-system + (inherit base-os) + (packages (cons wsdd (operating-system-packages base-os)))))) + +(define* (run-wsdd-test) + "Return a test of an OS running wsdd service." + + (define vm + (virtual-machine + (operating-system (marionette-operating-system + %wsdd-os + #:imported-modules '((gnu services herd)))) + (port-forwardings '((8135 . 135) + (8137 . 137) + (8138 . 138) + (8445 . 445))))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-26) + (srfi srfi-64)) + + (define marionette + (make-marionette '(#$vm))) + + (test-runner-current (system-test-runner #$output)) + (test-begin "wsdd") + + ;; Here shall be more tests to begin with. + + (test-assert "wsdd running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'wsdd)) + marionette)) + + (test-end)))) + + (gexp->derivation "samba-test" test)) + +(define %test-wsdd + (system-test + (name "wsdd") + (description "Connect to a running wsdd daemon.") + (value (run-wsdd-test)))) -- 2.37.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Sep 24 03:48:30 2022 Received: (at 54561-done) by debbugs.gnu.org; 24 Sep 2022 07:48:30 +0000 Received: from localhost ([127.0.0.1]:42225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obztm-0007RS-Bc for submit@debbugs.gnu.org; Sat, 24 Sep 2022 03:48:30 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]:45740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1obztj-0007RE-VX for 54561-done@debbugs.gnu.org; Sat, 24 Sep 2022 03:48:28 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4MZLjX358vz9sRw; Sat, 24 Sep 2022 09:48:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1664005696; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UdSw3r+P1P0DEING8N79CrYBEjtgfg2XLj3ZE5sbGn8=; b=lJi/Y6H6crG08qiHCraDPPW+TNx+wh38CXz9b4PrTud1UgZimKt8yd2Zf/XvPjC2ZETA+B 27Tl+hnrbF2g4hctsXVB7wbghZlPQStDvZDmlTdUKiyqXw2hz5UssxfBF+eJc2hPbL7pdF b7YcdyoS0e1MLJL+c3ySZLiGnb7kMrHcBIzPrBOqdQqt2k7fM5yRZiPxjnrnnQkV0E6Oof WYCsyMhkz8/quItVIKNDY1P35qEevVOB/eEiWIyWwDND9pteB9YjVJwnlvaLat2QTJjNZp UXL9qRNZdIq0fPdX+jTKYedtRZQ2Jq71hL70xofINNZbLKqq/arIXmzl8nXcHw== Date: Sat, 24 Sep 2022 09:48:10 +0200 From: Lars-Dominik Braun To: simon@netpanic.org Subject: Re: [PATCH v3 0/4] Add samba and wsdd to services list. Message-ID: References: <20220808145643.3445-1-simon@netpanic.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220808145643.3445-1-simon@netpanic.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54561-done Cc: 54561-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Simon, > Hello, here my third iteration preparing this patch series. thanks for the update. I’ve been running it on my NAS for a few days and it works quite well. I addressed Ludo’s remaining comments, adjusted your commit messages and pushed your contribution as commit 4cbc1622961f62f8fc3613de0c8f215e0cde6494 and following. Thank you very much, Lars From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 25 04:22:50 2022 Received: (at 54561) by debbugs.gnu.org; 25 Sep 2022 08:22:50 +0000 Received: from localhost ([127.0.0.1]:45833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocMuY-0003LC-Cb for submit@debbugs.gnu.org; Sun, 25 Sep 2022 04:22:50 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:53602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ocMuU-0003Kv-Rs for 54561@debbugs.gnu.org; Sun, 25 Sep 2022 04:22:48 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4MZzQk5nPsz9sQG; Sun, 25 Sep 2022 10:22:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1664094158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DtwhqUnNMwn0sN5IOu0h2dgWHuj9BG4ddVwAn+DT+0M=; b=upJarfI4ck5f2rDq95vrl4bYx3/CTjphtdydQH3fMcwDP9rcX03ACM2bX0loUKSYDk0zCh RtYVFnCLMZ7xFSwkJk09mfiaTK+D8nJPJPg4aPgZEuSEHeves5BHEaNiapZWsWQPmx0G7R BfIBSLD1cPeIAlFPCo1fHMfHW3wZwTF9VRwz6LdaGMrnzG6mFZTzkysO3ALF2QsxhR9HxM n09jn/s/SmAUskqEGweNDeA/m460ybDtDf6XK8PLBZCaidabSfXGsbmYc+gTU6Rjp0nj4E jqBSViPg8ZrbPl85FrNyP2a8ZIGQlqrJGSxiXcrYjZAHpGMFSY52UXzLKzF78A== Date: Sun, 25 Sep 2022 10:22:36 +0200 From: Lars-Dominik Braun To: simon@netpanic.org Subject: Re: [PATCH v3 0/4] Add samba and wsdd to services list. Message-ID: References: <20220808145643.3445-1-simon@netpanic.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54561 Cc: 54561@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi, > > Hello, here my third iteration preparing this patch series. > thanks for the update. I’ve been running it on my NAS for a few days > and it works quite well. I addressed Ludo’s remaining comments, > adjusted your commit messages and pushed your contribution as commit > 4cbc1622961f62f8fc3613de0c8f215e0cde6494 and following. I had to revert the commit adding avahi to samba in commit dc7191302e6d099a26673e08b78eb5f4b2a2b17b and added it to core-updates as commit 4d0befe66ae7fa731b566090b471107bc4828018 instead, because it caused too many rebuilds. Lars From unknown Sat Jun 14 03:53:26 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 23 Oct 2022 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator