From 1464af1e80d93adbe5b350d044e89b18dd64b7af Mon Sep 17 00:00:00 2001
From: Stephane Armanet <stephanearmanet@esss.lu.se>
Date: Thu, 4 Jul 2019 16:54:18 +0200
Subject: [PATCH] move home folder to the smb-pss.conf
---
templates/smb-pss.conf.j2 | 17 +++++++++++++++++
templates/smb.conf.j2 | 17 +----------------
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/templates/smb-pss.conf.j2 b/templates/smb-pss.conf.j2
index 452470f..a8e1bf3 100644
--- a/templates/smb-pss.conf.j2
+++ b/templates/smb-pss.conf.j2
@@ -4,3 +4,20 @@
force user = "{{ pss_nas_softs_owner }}"
valid users =
+[homes]
+ comment = Home Directory
+ read only = No
+ browseable = No
+ valid users = "ESSS+%S"
+ path = /home/%U
+
+# vfs objects = virusfilter
+# virusfilter:scanner = clamav
+# virusfilter:socket path = /run/clamd.scan/clamd.sock
+# virusfilter:connect timeout = 30000
+# virusfilter:scan on open = yes
+# #virusfilter:scan on close = yes
+# virusfilter:max file size = 1000000000
+# virusfilter:infected file action = quarantine
+# virusfilter:quarantine directory = /var/tmp/quarantine
+~
diff --git a/templates/smb.conf.j2 b/templates/smb.conf.j2
index 325d73f..f2eec6f 100644
--- a/templates/smb.conf.j2
+++ b/templates/smb.conf.j2
@@ -33,7 +33,7 @@
winbind offline logon = yes
winbind refresh tickets = yes
map acl inherit = Yes
- username map script = /etc/samba/win2unixusers
+# username map script = /etc/samba/win2unixusers
@@ -50,18 +50,3 @@
{% if smb_domain == "PSS" %}
include = /etc/samba/smb-pss.conf
{% endif %}
-
-[homes]
- comment = Home Directory
- read only = No
- browseable = No
- valid users = %S
-# vfs objects = virusfilter
-# virusfilter:scanner = clamav
-# virusfilter:socket path = /run/clamd.scan/clamd.sock
-# virusfilter:connect timeout = 30000
-# virusfilter:scan on open = yes
-# #virusfilter:scan on close = yes
-# virusfilter:max file size = 1000000000
-# virusfilter:infected file action = quarantine
-# virusfilter:quarantine directory = /var/tmp/quarantine
--
GitLab