Refactor Ansible tasks and templates for improved consistency and clarity
This commit is contained in:
+29
-30
@@ -99,27 +99,27 @@ nfs_start_servers: 32
|
||||
# Take car to increase 'fsid' in case of more than one export
|
||||
#
|
||||
nfs_exports:
|
||||
- src: 192.168.82.10:/data/home
|
||||
path: /data/home
|
||||
mount_opts: user,exec,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.82.0/24
|
||||
- 10.0.82.0/24
|
||||
- 10.1.82.0/24
|
||||
- 192.168.63.0/24
|
||||
use_fsid_option: true
|
||||
- src: 192.168.82.10:/data/home
|
||||
path: /data/home
|
||||
mount_opts: user,exec,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.82.0/24
|
||||
- 10.0.82.0/24
|
||||
- 10.1.82.0/24
|
||||
- 192.168.63.0/24
|
||||
use_fsid_option: true
|
||||
|
||||
- src: 192.168.82.10:/data/samba
|
||||
path: /data/samba
|
||||
mount_opts: user,exec,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.82.0/24
|
||||
- 10.0.82.0/24
|
||||
- 10.1.82.0/24
|
||||
- 192.168.63.0/24
|
||||
use_fsid_option: true
|
||||
- src: 192.168.82.10:/data/samba
|
||||
path: /data/samba
|
||||
mount_opts: user,exec,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.82.0/24
|
||||
- 10.0.82.0/24
|
||||
- 10.1.82.0/24
|
||||
- 192.168.63.0/24
|
||||
use_fsid_option: true
|
||||
|
||||
|
||||
# ==========
|
||||
@@ -158,7 +158,7 @@ pureftpd_virtual_users:
|
||||
uid: jibran
|
||||
gid: users
|
||||
|
||||
#pureftpd_virtual_deleted_users:
|
||||
# pureftpd_virtual_deleted_users:
|
||||
#
|
||||
# Available properties
|
||||
# - name: vuser2
|
||||
@@ -176,10 +176,10 @@ pureftpd_virtual_users_import: false
|
||||
pureftpd_tls_certificate_method: 'generate'
|
||||
|
||||
# for method 'generate'
|
||||
#
|
||||
#
|
||||
# Available properties
|
||||
#
|
||||
#pureftpd_tls_certificate_openssl:
|
||||
# pureftpd_tls_certificate_openssl:
|
||||
# size: 4096
|
||||
# days: 365
|
||||
# fqdn: ftp.example.com
|
||||
@@ -207,19 +207,19 @@ pureftpd_tls_certificate_openssl:
|
||||
#
|
||||
# On NIS supported Server put your users and groups in the
|
||||
# appropriate section for playbook 'nis-user.yml'
|
||||
#
|
||||
#
|
||||
# ! Notice !
|
||||
|
||||
remove_system_users: []
|
||||
#remove_system_users:
|
||||
# remove_system_users:
|
||||
# - name: test
|
||||
|
||||
system_users: []
|
||||
#system_users:
|
||||
# system_users:
|
||||
# - name: test
|
||||
# password: 'test100'
|
||||
|
||||
#system_users:
|
||||
# system_users:
|
||||
#
|
||||
# - name: sysadm
|
||||
# password: '9xFXkdPR_2'
|
||||
@@ -259,7 +259,7 @@ nis_groups:
|
||||
group_id: 1130
|
||||
|
||||
remove_nis_users: []
|
||||
#remove_nis_users:
|
||||
# remove_nis_users:
|
||||
# - name: anna
|
||||
# - name: birgit
|
||||
# - name: jonas
|
||||
@@ -470,7 +470,7 @@ samba_shares:
|
||||
recycle_path: '@Recycle.Bin'
|
||||
user:
|
||||
- buero
|
||||
- chris
|
||||
- chris
|
||||
- jibran
|
||||
- praktikum
|
||||
- maica
|
||||
@@ -689,4 +689,3 @@ sudo_pc_users:
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/luks.yml
|
||||
# ==========
|
||||
|
||||
|
||||
+28
-33
@@ -121,7 +121,7 @@ resolved_nameserver:
|
||||
# If there are more than one search domains, then specify them here in the order in which
|
||||
# the resolver should also search them
|
||||
#
|
||||
#resolved_domains: []
|
||||
# resolved_domains: []
|
||||
resolved_domains:
|
||||
- ~.
|
||||
- flr.netz
|
||||
@@ -131,16 +131,12 @@ resolved_dnssec: false
|
||||
# dns.as250.net: 194.150.168.168
|
||||
#
|
||||
resolved_fallback_nameserver:
|
||||
- 172.16.102.254
|
||||
|
||||
|
||||
- 172.16.102.254
|
||||
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/git.yml
|
||||
# ==========
|
||||
|
||||
|
||||
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/ntp.yml
|
||||
# ==========
|
||||
@@ -162,29 +158,29 @@ nfs_start_servers: 16
|
||||
# partition.
|
||||
#
|
||||
nfs_exports:
|
||||
- src: 192.168.102.10:/data/home
|
||||
path: /data/home
|
||||
mount_opts: users,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.102.0/24
|
||||
- 10.0.102.0/24
|
||||
- 10.1.102.0/24
|
||||
- 192.168.63.0/24
|
||||
fs_encrypted: false
|
||||
use_fsid_option: true
|
||||
- src: 192.168.102.10:/data/home
|
||||
path: /data/home
|
||||
mount_opts: users,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.102.0/24
|
||||
- 10.0.102.0/24
|
||||
- 10.1.102.0/24
|
||||
- 192.168.63.0/24
|
||||
fs_encrypted: false
|
||||
use_fsid_option: true
|
||||
|
||||
- src: 192.168.102.10:/data/samba
|
||||
path: /data/samba
|
||||
mount_opts: users,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.102.0/24
|
||||
- 10.0.102.0/24
|
||||
- 10.1.102.0/24
|
||||
- 192.168.63.0/24
|
||||
fs_encrypted: false
|
||||
use_fsid_option: true
|
||||
- src: 192.168.102.10:/data/samba
|
||||
path: /data/samba
|
||||
mount_opts: users,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.102.0/24
|
||||
- 10.0.102.0/24
|
||||
- 10.1.102.0/24
|
||||
- 192.168.63.0/24
|
||||
fs_encrypted: false
|
||||
use_fsid_option: true
|
||||
|
||||
|
||||
# ==========
|
||||
@@ -206,7 +202,7 @@ nfs_exports:
|
||||
remove_system_users: []
|
||||
|
||||
system_users: []
|
||||
#system_users:
|
||||
# system_users:
|
||||
# - name: sysadm
|
||||
# password: '9xFXkdPR_2'
|
||||
|
||||
@@ -253,7 +249,7 @@ nis_groups:
|
||||
group_id: 1038
|
||||
|
||||
remove_nis_users: []
|
||||
#remove_nis_users:
|
||||
# remove_nis_users:
|
||||
# - name: test
|
||||
# - name: ivana
|
||||
|
||||
@@ -484,7 +480,7 @@ samba_server_cidr_prefix: 24
|
||||
samba_workgroup: FLR
|
||||
samba_netbios_name: FILE-FLR
|
||||
|
||||
#samba_allow_insecure_wide_links: !!str yes
|
||||
# samba_allow_insecure_wide_links: !!str yes
|
||||
|
||||
samba_shares:
|
||||
- name: Team
|
||||
@@ -583,7 +579,7 @@ samba_shares:
|
||||
group_write_list: team
|
||||
file_create_mask: '0660'
|
||||
dir_create_mask: '2770'
|
||||
#wide_links: !!str yes
|
||||
# wide_links: !!str yes
|
||||
vfs_object_virusfilter: true
|
||||
vfs_object_recycle: true
|
||||
recycle_path: '@Recycle.Bin'
|
||||
@@ -634,4 +630,3 @@ sudo_pc_users:
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/luks.yml
|
||||
# ==========
|
||||
|
||||
|
||||
+6
-14
@@ -33,7 +33,7 @@ sshd_permit_root_login: !!str "prohibit-password"
|
||||
|
||||
# name or ip-adress from the (local) ntp server, mostly the gateway
|
||||
#
|
||||
#ntp_server: gw-kb.anw-kb.netz
|
||||
# ntp_server: gw-kb.anw-kb.netz
|
||||
|
||||
|
||||
# ==========
|
||||
@@ -147,8 +147,6 @@ nfs_exports:
|
||||
- 10.0.32.109
|
||||
- 192.168.2.190
|
||||
use_fsid_option: true
|
||||
|
||||
|
||||
|
||||
|
||||
# ==========
|
||||
@@ -163,12 +161,12 @@ nfs_exports:
|
||||
# ! Notice !
|
||||
|
||||
remove_system_users: []
|
||||
#remove_system_users:
|
||||
# remove_system_users:
|
||||
# - name: test
|
||||
# - name: jennifer.prost
|
||||
|
||||
system_users: []
|
||||
#system_users:
|
||||
# system_users:
|
||||
# - name: sysadm
|
||||
# password: '9xFXkdPR_2'
|
||||
|
||||
@@ -204,15 +202,14 @@ nis_groups:
|
||||
group_id: 1200
|
||||
|
||||
|
||||
|
||||
#nis_groups:
|
||||
# nis_groups:
|
||||
# - name: mbr-finanzen (wird zu vdk)
|
||||
# group_id: 1210
|
||||
# - name: mbr-personal (wird zu mbr-finanzen-personal)
|
||||
# group_id: 1220
|
||||
|
||||
remove_nis_users: []
|
||||
#remove_nis_users:
|
||||
# remove_nis_users:
|
||||
# - name: test
|
||||
# - name: jennifer.prost
|
||||
|
||||
@@ -309,7 +306,6 @@ nis_user:
|
||||
password: ''
|
||||
|
||||
|
||||
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/samba-install.yml
|
||||
# ==========
|
||||
@@ -348,7 +344,6 @@ samba_netbios_name: FILE-KB
|
||||
samba_server_min_protocol: !!str "NT1"
|
||||
|
||||
|
||||
|
||||
samba_shares:
|
||||
|
||||
# ---
|
||||
@@ -428,8 +423,6 @@ samba_shares:
|
||||
recycle_path: '@Recycle.Bin'
|
||||
|
||||
|
||||
|
||||
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/system-user-systemfiles.yml
|
||||
# ==========
|
||||
@@ -438,7 +431,7 @@ samba_shares:
|
||||
#
|
||||
# variables used from other previos sections:
|
||||
#
|
||||
# - system_users: roles/common/tasks/system-user.yml
|
||||
# - system_users: roles/common/tasks/system-user.yml
|
||||
|
||||
|
||||
# ==========
|
||||
@@ -477,4 +470,3 @@ sudo_pc_users:
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/luks.yml
|
||||
# ==========
|
||||
|
||||
|
||||
+173
-207
File diff suppressed because it is too large
Load Diff
@@ -46,27 +46,27 @@ nfs_start_servers: 16
|
||||
# Take car to increase 'fsid' in case of more than one export
|
||||
#
|
||||
nfs_exports:
|
||||
- src: 192.168.92.10:/data/home
|
||||
path: /data/home
|
||||
mount_opts: users,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.92.0/24
|
||||
- 10.0.92.0/24
|
||||
- 10.1.92.0/24
|
||||
- 192.168.63.0/24
|
||||
fs_encrypted: false
|
||||
- src: 192.168.92.10:/data/home
|
||||
path: /data/home
|
||||
mount_opts: users,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.92.0/24
|
||||
- 10.0.92.0/24
|
||||
- 10.1.92.0/24
|
||||
- 192.168.63.0/24
|
||||
fs_encrypted: false
|
||||
|
||||
- src: 192.168.92.10:/data/samba
|
||||
path: /data/samba
|
||||
mount_opts: users,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.92.0/24
|
||||
- 10.0.92.0/24
|
||||
- 10.1.92.0/24
|
||||
- 192.168.63.0/24
|
||||
fs_encrypted: false
|
||||
- src: 192.168.92.10:/data/samba
|
||||
path: /data/samba
|
||||
mount_opts: users,rsize=8192,wsize=8192,hard,intr
|
||||
export_opt: rw,root_squash,sync,subtree_check
|
||||
export_networks:
|
||||
- 192.168.92.0/24
|
||||
- 10.0.92.0/24
|
||||
- 10.1.92.0/24
|
||||
- 192.168.63.0/24
|
||||
fs_encrypted: false
|
||||
|
||||
|
||||
# ==========
|
||||
@@ -81,14 +81,14 @@ nfs_exports:
|
||||
# ! Notice !
|
||||
|
||||
remove_system_users: []
|
||||
#remove_system_users:
|
||||
# - name: test
|
||||
# - name: jennifer.prost
|
||||
# remove_system_users:
|
||||
# - name: test
|
||||
# - name: jennifer.prost
|
||||
|
||||
system_users: []
|
||||
#system_users:
|
||||
# - name: sysadm
|
||||
# password: '9xFXkdPR_2'
|
||||
# system_users:
|
||||
# - name: sysadm
|
||||
# password: '9xFXkdPR_2'
|
||||
|
||||
system_groups: []
|
||||
|
||||
@@ -122,19 +122,18 @@ nis_groups:
|
||||
- name: no-backup
|
||||
group_id: 1120
|
||||
|
||||
#remove_nis_users:
|
||||
# - name: lea
|
||||
# - name: alina
|
||||
#remove_nis_users:
|
||||
# - name: daniel
|
||||
# - name: andrea
|
||||
# - name: tali
|
||||
# - name: eva
|
||||
# - name: mariam
|
||||
# - name: simone
|
||||
# remove_nis_users:
|
||||
# - name: lea
|
||||
# - name: alina
|
||||
# remove_nis_users:
|
||||
# - name: daniel
|
||||
# - name: andrea
|
||||
# - name: tali
|
||||
# - name: eva
|
||||
# - name: mariam
|
||||
# - name: simone
|
||||
|
||||
nis_user:
|
||||
|
||||
- name: chris
|
||||
groups:
|
||||
- intern
|
||||
@@ -142,12 +141,12 @@ nis_user:
|
||||
- no-backup
|
||||
is_samba_user: true
|
||||
password: !vault |
|
||||
$ANSIBLE_VAULT;1.1;AES256
|
||||
35653838343532663632326462656437363665316337316336316335383263633630616638313736
|
||||
3937666561356232666136646435613361336437303637360a353561316633373265323931623565
|
||||
32643966373962313334343565643130373535353238316161623837333130353231343332663930
|
||||
3638386337333636390a393738373935646638383237373663376434366361363938346335663438
|
||||
6637
|
||||
$ANSIBLE_VAULT;1.1;AES256
|
||||
35653838343532663632326462656437363665316337316336316335383263633630616638313736
|
||||
3937666561356232666136646435613361336437303637360a353561316633373265323931623565
|
||||
32643966373962313334343565643130373535353238316161623837333130353231343332663930
|
||||
3638386337333636390a393738373935646638383237373663376434366361363938346335663438
|
||||
6637
|
||||
|
||||
- name: anahit
|
||||
groups:
|
||||
@@ -451,19 +450,13 @@ sudo_pc_users:
|
||||
- sysadm
|
||||
- localadmin
|
||||
|
||||
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/sudoers-server.yml
|
||||
# ==========
|
||||
|
||||
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml
|
||||
# vars used by roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml
|
||||
# ==========
|
||||
|
||||
|
||||
# ==========
|
||||
# vars used by roles/common/tasks/luks.yml
|
||||
# ==========
|
||||
|
||||
|
||||
Reference in New Issue
Block a user