update..
This commit is contained in:
parent
246ce4bfbf
commit
2c476c9955
@ -206,6 +206,7 @@ nis_user:
|
|||||||
- quali
|
- quali
|
||||||
- aktion-mensch
|
- aktion-mensch
|
||||||
- foerderung
|
- foerderung
|
||||||
|
- buchhaltung
|
||||||
- verwaltung
|
- verwaltung
|
||||||
is_samba_user: true
|
is_samba_user: true
|
||||||
password: '20_katha-mue%19'
|
password: '20_katha-mue%19'
|
||||||
@ -247,9 +248,14 @@ nis_user:
|
|||||||
|
|
||||||
- name: vincent
|
- name: vincent
|
||||||
groups:
|
groups:
|
||||||
- amif
|
|
||||||
- team
|
- team
|
||||||
- esf-bleibnet
|
- esf-bleibnet
|
||||||
|
- amif
|
||||||
|
- quali
|
||||||
|
- aktion-mensch
|
||||||
|
- foerderung
|
||||||
|
- buchhaltung
|
||||||
|
- verwaltung
|
||||||
is_samba_user: true
|
is_samba_user: true
|
||||||
password: 'vin-20-cent_21!'
|
password: 'vin-20-cent_21!'
|
||||||
|
|
||||||
|
@ -768,6 +768,7 @@ nis_user:
|
|||||||
- ag-antisem
|
- ag-antisem
|
||||||
- rias-bund
|
- rias-bund
|
||||||
- rias-berlin
|
- rias-berlin
|
||||||
|
- rias-berlin-finanzen-personal
|
||||||
is_samba_user: true
|
is_samba_user: true
|
||||||
password: '-a2%3bTzkW.A'
|
password: '-a2%3bTzkW.A'
|
||||||
|
|
||||||
@ -838,6 +839,7 @@ nis_user:
|
|||||||
- ag-antisem
|
- ag-antisem
|
||||||
- rias-bund
|
- rias-bund
|
||||||
- rias-berlin
|
- rias-berlin
|
||||||
|
- rias-berlin-finanzen-personal
|
||||||
is_samba_user: true
|
is_samba_user: true
|
||||||
password: 'q2Sc.C7-6hZR'
|
password: 'q2Sc.C7-6hZR'
|
||||||
|
|
||||||
@ -1144,7 +1146,7 @@ samba_shares:
|
|||||||
recycle_path: '@Recycle.Bin'
|
recycle_path: '@Recycle.Bin'
|
||||||
|
|
||||||
- name: RIAS-Bund-Finanzen-Personal
|
- name: RIAS-Bund-Finanzen-Personal
|
||||||
path: /data/shares/RIAS-Finanzen-Personal
|
path: /data/shares/RIAS-Bund-Finanzen-Personal
|
||||||
group_valid_users: rias-bund-finanzen-personal
|
group_valid_users: rias-bund-finanzen-personal
|
||||||
group_write_list: rias-bund-finanzen-personal
|
group_write_list: rias-bund-finanzen-personal
|
||||||
file_create_mask: '0660'
|
file_create_mask: '0660'
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -96,6 +96,7 @@ iface {{ config.device }} {{ config.family | default('inet', true) }} {{ config.
|
|||||||
|
|
||||||
{# #}
|
{# #}
|
||||||
{# nameservers #}
|
{# nameservers #}
|
||||||
|
{% set ns = namespace(ips='') %}
|
||||||
{%- if (config.nameservers is defined and config.nameservers) or (config.search is defined and config.search) %}
|
{%- if (config.nameservers is defined and config.nameservers) or (config.search is defined and config.search) %}
|
||||||
# dns-* options are implemented by the resolvconf package, if installed
|
# dns-* options are implemented by the resolvconf package, if installed
|
||||||
# sets entries in /etc/resolv.conf
|
# sets entries in /etc/resolv.conf
|
||||||
@ -106,8 +107,9 @@ iface {{ config.device }} {{ config.family | default('inet', true) }} {{ config.
|
|||||||
{% endif -%}
|
{% endif -%}
|
||||||
{%- if (config.nameservers is defined) and config.nameservers %}
|
{%- if (config.nameservers is defined) and config.nameservers %}
|
||||||
{% for _ip in config.nameservers %}
|
{% for _ip in config.nameservers %}
|
||||||
dns-nameservers {{ _ip }}
|
{% set ns.ips = ns.ips + ' ' + _ip %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
dns-nameservers{{ ns.ips }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{%- if (config.nameservers is defined and config.nameservers) or (config.search is defined and config.search) %}
|
{%- if (config.nameservers is defined and config.nameservers) or (config.search is defined and config.search) %}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user