From 091322a6644f67b8317e1227316a2ffeafabf393 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Thu, 20 Oct 2022 10:00:08 +0200 Subject: [PATCH] Update to 2022-10-20 10:00 --- roles/nas/defaults/main.yml | 3 +++ roles/nas/templates/smb.conf.j2 | 1 + roles/samba/defaults/main.yml | 3 +++ roles/samba/templates/smb.conf.j2 | 2 ++ 4 files changed, 9 insertions(+) diff --git a/roles/nas/defaults/main.yml b/roles/nas/defaults/main.yml index a19a3c4..fb191db 100644 --- a/roles/nas/defaults/main.yml +++ b/roles/nas/defaults/main.yml @@ -21,6 +21,8 @@ nas_shares: [] # browseable: True # guest_ok: False # nt_acl: True +# custom_conf: | +# fruit:time machine = yes # rsync: # enabled: True # read_only: True @@ -60,6 +62,7 @@ nas_default_share: guest_ok: False full_audit: True nt_acl: False + custom_conf: '# No custom configuration' rsync: enabled: False read_only: True diff --git a/roles/nas/templates/smb.conf.j2 b/roles/nas/templates/smb.conf.j2 index 6570c5b..1a8e1d4 100644 --- a/roles/nas/templates/smb.conf.j2 +++ b/roles/nas/templates/smb.conf.j2 @@ -49,6 +49,7 @@ full_audit:failure=mkdir rmdir open opendir close closedir rename unlink connect disconnect full_audit:prefix=%u|%D|%I|%M|%S {% endif %} +{{ share.protocols.smb.custom_conf | indent(2, True) }} {% endif %} diff --git a/roles/samba/defaults/main.yml b/roles/samba/defaults/main.yml index 9e269ac..e8302bc 100644 --- a/roles/samba/defaults/main.yml +++ b/roles/samba/defaults/main.yml @@ -98,3 +98,6 @@ samba_trusted_domains: {} # samba_min_protocol: NT1 # samba_max_protocol: SMB3 + +# Custom samba global parameters +samba_custom_conf: '# No custom configuration defined' diff --git a/roles/samba/templates/smb.conf.j2 b/roles/samba/templates/smb.conf.j2 index 1909273..3069f75 100644 --- a/roles/samba/templates/smb.conf.j2 +++ b/roles/samba/templates/smb.conf.j2 @@ -44,6 +44,8 @@ tls keyfile = {{ samba_tls_key }} {% endif %} +{{ samba_custom_conf | indent(4, True) }} + [netlogon] path = /var/lib/samba/sysvol/{{ samba_realm }}/scripts read only = no