From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 8 Oct 2020 21:40:12 +0000 (+0100)
Subject: samba: Export all printers from CUPS
X-Git-Tag: v2.25-core152~7^2~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be1554336d3f6dde722fe34dffb45419f21e04dd;p=ipfire-2.x.git

samba: Export all printers from CUPS

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba
index ad5ffb2047..4ee93218eb 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 9d445db8f4..471d819823 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 0888fc6edf..73057db97e 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 54afad4d2e..1940211d6b 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 a9478a139c..c0485b48d0 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 5c527b257d..38957cec9c 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)