From patchwork Tue Oct 13 16:07:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3547 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gTQ1Pdkz3x1S for ; Tue, 13 Oct 2020 16:08:58 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSs0MTNz1Jq; Tue, 13 Oct 2020 16:08:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSp0vnTz305L; Tue, 13 Oct 2020 16:08:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSl2LCPz2xBf for ; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSk0hGRz1GD; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K9NbPkBDjir3chdnTbZAQIHRSqzvcHkubrC3UQHz6w4=; b=ShI96VXavjoO5YAI8z+lJdV495sw2o2FxqRcx4vKfKseq2CDBKLqKvXYUTQPbGAXAVGwc1 WqtptBaGunZTLlCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K9NbPkBDjir3chdnTbZAQIHRSqzvcHkubrC3UQHz6w4=; b=SmN/5chA8zSOsLXYjakMWDPMmpn7eYKbGt1+/zUnkA9l9rWQ82NsS3S+F19W33nkIli0nK ISnENVafQm+CJl8sNB3GSiYSeCSxLjy1NZfmthhR/6vKBD8hUdWwP3bnf7rfi1n6H0YpCg 7rr3VeKoYjF4hxL/t6+5vEOHLLtE7j2SVOh8VTu0mQDc1eOqnS3QoDpkGC4i4W1h9N6ohN SExz1+NkQbonapujf4sXKyMm2FVbwQAfhNkkk84Zv2xnjShcnc9Rr1dwGx0lQbhCBs2pXp eJLPd3wKNcjAUFgdFKD+x4GQR9zVPaI0Eo/Jd5WY/hx71vo99u6WJrC37tJQog== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 21/54] samba: Export all printers from CUPS Date: Tue, 13 Oct 2020 16:07:39 +0000 Message-Id: <20201013160812.27754-21-michael.tremer@ipfire.org> In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/packages/aarch64/samba | 1 + config/rootfiles/packages/armv5tel/samba | 1 + config/rootfiles/packages/i586/samba | 1 + config/rootfiles/packages/x86_64/samba | 1 + html/cgi-bin/samba.cgi | 6 ++++++ lfs/samba | 4 ++++ 6 files changed, 14 insertions(+) diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index ad5ffb204..4ee93218e 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -807,6 +807,7 @@ var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd +var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba index 9d445db8f..471d81982 100644 --- a/config/rootfiles/packages/armv5tel/samba +++ b/config/rootfiles/packages/armv5tel/samba @@ -807,6 +807,7 @@ var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd +var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index 0888fc6ed..73057db97 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -807,6 +807,7 @@ var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd +var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index 54afad4d2..1940211d6 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -807,6 +807,7 @@ var/lib/samba/bind-dns var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd +var/spool/samba srv/web/ipfire/cgi-bin/samba.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index a9478a139..c0485b48d 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -198,6 +198,12 @@ logging = syslog preferred master = $sambasettings{'PREFERREDMASTER'} domain master = $sambasettings{'DOMAINMASTER'} local master = $sambasettings{'LOCALMASTER'} + +# Export all printers +[printers] +path = /var/spool/samba/ +printable = yes + END ; close FILE; diff --git a/lfs/samba b/lfs/samba index 5c527b257..38957cec9 100644 --- a/lfs/samba +++ b/lfs/samba @@ -110,6 +110,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod 750 /var/lib/samba/winbindd_privileged chgrp wbpriv /var/lib/samba/winbindd_privileged + # Create spool directory for print jobs + mkdir -p /var/spool/samba + chmod -v 1777 /var/spool/samba/ + #install initscripts $(call INSTALL_INITSCRIPT,samba)