Merge README, fix typo in config template

This commit is contained in:
Bert Van Vreckem 2017-05-09 10:30:52 +02:00
commit 72ce55f141
2 changed files with 13 additions and 1 deletions

View File

@ -38,6 +38,7 @@ No specific requirements
| `samba_shares_root` | `/srv/shares` | Directories for the shares are created under this directory. | | `samba_shares_root` | `/srv/shares` | Directories for the shares are created under this directory. |
| `samba_users` | [] | List of dicts defining users that can access shares. | | `samba_users` | [] | List of dicts defining users that can access shares. |
| `samba_workgroup` | `WORKGROUP` | Name of the server workgroup. | | `samba_workgroup` | `WORKGROUP` | Name of the server workgroup. |
| `samba_guest_account` | - | Guest account for unknown users |
### Defining users ### Defining users
@ -135,14 +136,16 @@ A complete overview of share options follows below. Only `name` is required, the
| `force_create_mode` | `0664` | See the Samba documentation for details. | | `force_create_mode` | `0664` | See the Samba documentation for details. |
| `force_directory_mode` | `0775` | See the Samba documentation for details. | | `force_directory_mode` | `0775` | See the Samba documentation for details. |
| `group` | `users` | The user group files in the share will be added to. | | `group` | `users` | The user group files in the share will be added to. |
| `guest_ok` | - | Allow guest access. |
| `name` (required) | - | The name of the share. | | `name` (required) | - | The name of the share. |
| `owner` | `root` | Set the owner of the path | | `owner` | `root` | Set the owner of the path |
| `path` | /{{samba_shares_root}}/{{name}} | The path to the share directory. | | `path` | /{{samba_shares_root}}/{{name}} | The path to the share directory. |
| `public` | `no` | Controls read access for guest users | | `public` | `no` | Controls read access for guest users |
| `setype` | `samba_share_t` | The SELinux type of the share directory | | `setype` | `samba_share_t` | The SELinux type of the share directory |
| `valid_users` | - | Controls read access for registered users. Use the syntax of the corresponding Samba setting. | | `valid_users` | - | Controls read access for registered users. Use the syntax of the corresponding Samba setting. |
| `write_list` | - | Controls write access for registered users. Use the syntax of the corresponding Samba setting. |
| `vfs_objects` | - | See the Samba documentation for details. | | `vfs_objects` | - | See the Samba documentation for details. |
| `writable` | - | Writable for guests. |
| `write_list` | - | Controls write access for registered users. Use the syntax of the corresponding Samba setting. |
The values for `valid_users` and `write_list` should be a comma separated list of users. Names prepended with `+` or `@` are interpreted as groups. The documentation for the [Samba configuration](https://www.samba.org/samba/docs/man/manpages-3/smb.conf.5.html) has more details on these options. The values for `valid_users` and `write_list` should be a comma separated list of users. Names prepended with `+` or `@` are interpreted as groups. The documentation for the [Samba configuration](https://www.samba.org/samba/docs/man/manpages-3/smb.conf.5.html) has more details on these options.

9
templates/smb.conf.j2 Normal file → Executable file
View File

@ -23,6 +23,9 @@
security = {{ samba_security }} security = {{ samba_security }}
passdb backend = {{ samba_passdb_backend }} passdb backend = {{ samba_passdb_backend }}
map to guest = {{ samba_map_to_guest }} map to guest = {{ samba_map_to_guest }}
{% if samba_guest_account is defined %}
guest account = {{ samba_guest_account }}
{% endif %}
{% if samba_interfaces|length > 0 %} {% if samba_interfaces|length > 0 %}
interfaces = {{ samba_interfaces }} interfaces = {{ samba_interfaces }}
@ -79,6 +82,12 @@
{% endif %} {% endif %}
{% if share.group is defined %} {% if share.group is defined %}
force group = {{ share.group }} force group = {{ share.group }}
{% endif %}
{% if share.guest_ok is defined %}
guest ok = {{ share.guest_ok }}
{% endif %}
{% if share.writable is defined %}
writable = {{ share.writable }}
{% endif %} {% endif %}
create mode = {{ share.create_mode|default('0664') }} create mode = {{ share.create_mode|default('0664') }}
force create mode = {{ share.force_create_mode|default('0664') }} force create mode = {{ share.force_create_mode|default('0664') }}