This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 1e2c442c9e2d11590af214bdddde5cf0506e0a52 (commit) from 0e42d81285766431f20bd92218d9c427162c96dc (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 1e2c442c9e2d11590af214bdddde5cf0506e0a52 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Nov 9 18:43:15 2020 +0000

samba: Add support for custom configuration changes

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

-----------------------------------------------------------------------

Summary of changes: config/backup/includes/samba | 1 + html/cgi-bin/samba.cgi | 12 ++++++++++++ lfs/samba | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-)

Difference in files: diff --git a/config/backup/includes/samba b/config/backup/includes/samba index 1d2166ca5..63d61a435 100644 --- a/config/backup/includes/samba +++ b/config/backup/includes/samba @@ -4,3 +4,4 @@ /var/ipfire/samba/settings /var/ipfire/samba/shares /var/ipfire/samba/smb.conf +/var/ipfire/samba/smb.conf.local diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index ec41adc5d..6a61300a2 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -835,6 +835,18 @@ if ($sambasettings{'ENCRYPTION'} =~ m/(desired|required)/) { print FILE "smb encrypt = $1\n"; }

+# Include smb.conf.local +if (-e "${General::swroot}/samba/smb.conf.local") { + open(LOCAL, "<${General::swroot}/samba/smb.conf.local"); + + # Copy content line by line + while (<LOCAL>) { + print FILE $_; + } + + close(LOCAL); +} + print FILE <<END; # Export all printers [printers] diff --git a/lfs/samba b/lfs/samba index 92a6b1121..29dfec2e9 100644 --- a/lfs/samba +++ b/lfs/samba @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 73 +PAK_VER = 74

DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp

hooks/post-receive -- IPFire 2.x development tree