up2date

samba/files/smb.conf.jinja

@@ -1,6 +1,6 @@
 #
 # Managed by Salt
-#
+# TODO: this could use file.serialize
 # run testparm -s after making changes to validate them
 
 [global]
@@ -10,27 +10,37 @@
   logging = file
   panic action = /usr/share/samba/panic-action %d
   server role = standalone server
-  obey pam restrictions = yes
+  obey pam restrictions = no
   unix password sync = no
   map to guest = bad user
   usershare max shares = 0
   encrypt passwords = yes
   smb encrypt = required
+  create mask = 0775
+  directory mask = 0775
+  force user = {{ pillar.samba.force_user }}
+  force group = {{ pillar.samba.force_group }}
+  vfs object = recycle
+  recycle:repository = /mnt/keir/recycle/%U
+  recycle:touch = Yes
+  recycle:keeptree = Yes
+  recycle:versions = Yes
+  recycle:noversions = *.tmp,*.temp,*.o,*.obj,*.TMP,*.TEMP
+  recycle:exclude = *.tmp,*.temp,*.o,*.obj,*.TMP,*.TEMP
+  recycle:excludedir = /recycle,/tmp,/temp,/TMP,/TEMP
 
 {% if salt.pillar.get('samba:enable_homes', false) %}
 [homes]
   comment = Home Directories
   browseable = no
   read only = yes
-  create mask = 0700
-  directory mask = 0700
   valid users = %S
 {% endif %}
 
 {% for name, conf in salt.pillar.get('samba:shares', {}).items() %}
 [{{ name }}]
-  path = {{ conf['path'] }}
-  valid users = {{ conf['users'] }}
-  read only = {{ conf['readonly'] }}
+  {%- for key, val in conf.items() %}
+  {{ key }} = {{ val }}
+  {%- endfor %}
 {% endfor %}