From 292445cec994e6abfa087b3f240491c0679facf5 Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 15 Jul 2024 14:36:48 +0200 Subject: [PATCH] update-- --- group_vars/akb.yml | 2 + group_vars/all/main.yml | 2 + group_vars/flr.yml | 2 + group_vars/kb.yml | 4 ++ group_vars/mbr.yml | 2 + group_vars/sprachenatelier.yml | 2 + hosts | 5 -- roles/common/handlers/main.yml | 5 ++ roles/common/tasks/nfs.yml | 62 +++++++++++++++++++ .../etc/nfs.conf.d/20-start_servers.conf.j2 | 4 ++ 10 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 roles/common/templates/etc/nfs.conf.d/20-start_servers.conf.j2 diff --git a/group_vars/akb.yml b/group_vars/akb.yml index a58ed18..174a4dd 100644 --- a/group_vars/akb.yml +++ b/group_vars/akb.yml @@ -43,6 +43,8 @@ ntp_server: gw-akb.akb.netz nfs_server: 192.168.82.10 +nfs_start_servers: 32 + # Set 'fs_encrypted' to true if filesystem lives on an encrypted # partition. # diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml index 12952af..97d3dfb 100644 --- a/group_vars/all/main.yml +++ b/group_vars/all/main.yml @@ -1114,6 +1114,8 @@ ntp_server: {} nfs_server: {} +nfs_start_servers: 16 + # Set 'fs_encrypted' to true if filesystem lives on an encrypted # partition. # diff --git a/group_vars/flr.yml b/group_vars/flr.yml index 075660b..f0df51c 100644 --- a/group_vars/flr.yml +++ b/group_vars/flr.yml @@ -109,6 +109,8 @@ ntp_server: gw-flr.flr.netz nfs_server: 192.168.102.10 +nfs_start_servers: 16 + # Set 'fs_encrypted' to true if filesystem lives on an encrypted # partition. # diff --git a/group_vars/kb.yml b/group_vars/kb.yml index eb0c58a..a0f7f0d 100644 --- a/group_vars/kb.yml +++ b/group_vars/kb.yml @@ -42,6 +42,8 @@ sshd_permit_root_login: !!str "prohibit-password" nfs_server: 192.168.32.20 +nfs_start_servers: 16 + # Set 'fs_encrypted' to true if filesystem lives on an encrypted # partition. # @@ -343,6 +345,8 @@ samba_server_cidr_prefix: 24 samba_workgroup: ANW-KB samba_netbios_name: FILE-KB +samba_server_min_protocol: !!str "NT1" + samba_shares: diff --git a/group_vars/mbr.yml b/group_vars/mbr.yml index fd676ec..66b2e2c 100644 --- a/group_vars/mbr.yml +++ b/group_vars/mbr.yml @@ -42,6 +42,8 @@ ntp_server: gw-mbr.mbr-bln.netz nfs_server: 192.168.112.10 +nfs_start_servers: 64 + # Set 'fs_encrypted' to true if filesystem lives on an encrypted # partition. # diff --git a/group_vars/sprachenatelier.yml b/group_vars/sprachenatelier.yml index 6fb8c47..5b7d014 100644 --- a/group_vars/sprachenatelier.yml +++ b/group_vars/sprachenatelier.yml @@ -37,6 +37,8 @@ ntp_server: gw-spr.sprachenatelier.netz nfs_server: 192.168.92.10 +nfs_start_servers: 16 + # Set 'fs_encrypted' to true if filesystem lives on an encrypted # partition. # diff --git a/hosts b/hosts index 4be9bbe..cb2d7a0 100644 --- a/hosts +++ b/hosts @@ -54,7 +54,6 @@ pcbuero4.flr.netz [flr_server] file-flr.flr.netz -192.168.102.166 # ----- # Sprachenatelier @@ -156,7 +155,6 @@ sprachenatelier_client [file_server] file-akb.akb.netz file-flr.flr.netz -192.168.102.166 file-mbr.mbr-bln.netz ansible_user=root file-spr.sprachenatelier.netz file-kb.anw-kb.netz @@ -165,7 +163,6 @@ file-kb.anw-kb.netz [nfs_server] file-akb.akb.netz file-flr.flr.netz -192.168.102.166 file-mbr.mbr-bln.netz ansible_user=root file-spr.sprachenatelier.netz file-kb.anw-kb.netz @@ -174,7 +171,6 @@ file-kb.anw-kb.netz [nis_server] file-akb.akb.netz file-flr.flr.netz -192.168.102.166 file-mbr.mbr-bln.netz ansible_user=root file-spr.sprachenatelier.netz file-kb.anw-kb.netz @@ -183,7 +179,6 @@ file-kb.anw-kb.netz [samba_server] file-akb.akb.netz file-flr.flr.netz -192.168.102.166 file-mbr.mbr-bln.netz ansible_user=root file-spr.sprachenatelier.netz file-kb.anw-kb.netz diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml index a9d1768..14eb95a 100644 --- a/roles/common/handlers/main.yml +++ b/roles/common/handlers/main.yml @@ -104,3 +104,8 @@ service: name: systemd-resolved state: restarted + +- name: Restart nfs-kernel-server + service: + name: nfs-kernel-server + state: restarted diff --git a/roles/common/tasks/nfs.yml b/roles/common/tasks/nfs.yml index 0960de8..24b6403 100644 --- a/roles/common/tasks/nfs.yml +++ b/roles/common/tasks/nfs.yml @@ -61,6 +61,68 @@ tags: - nfs-server +# --- +# /etc/default/nfs-kernel-server (Server) +# --- + +- name: (nfs.yml) Check if file '/etc/default/nfs-kernel-server.ORIG' exists + stat: + path: /etc/default/nfs-kernel-server + register: default_nfs_kernel_server_exists + when: + - "groups['nfs_server']|string is search(inventory_hostname)" + tags: + - nfs-server + +- name: (nfs.yml) Backup existing file /etc/default/nfs-kernel-server + command: cp -a /etc/default/nfs-kernel-server /etc/default/nfs-kernel-server.ORIG + when: + - "groups['nfs_server']|string is search(inventory_hostname)" + - default_nfs_kernel_server_exists.stat.exists == False + tags: + - nfs-server + +- name: (nfs.yml) Adjust file /etc/default/nfs-kernel-server - set 'RPCNFSDCOUNT' (server) + replace: + path: /etc/default/nfs-kernel-server + regexp: '^RPCNFSDCOUNT=.*' + replace: "RPCNFSDCOUNT={{ nfs_start_servers | default('16') }}" + when: + - "groups['nfs_server']|string is search(inventory_hostname)" + tags: + - nfs-server + +# --- +# Configuration Server +# --- + +- name: (nfs.yml) Ensure directory '/etc/nfs.conf.d' exists + file: + path: /etc/nfs.conf.d + state: directory + mode: 0755 + group: root + owner: root + when: + - inventory_hostname in groups['nfs_server'] + tags: + - nfs-server + + +- name: (nfs.yml) Create/Update file '/etc/nfs.conf.d/20-start_servers.conf' from template '20-start_servers.conf.j2' + template: + src: etc/nfs.conf.d/20-start_servers.conf.j2 + dest: /etc/nfs.conf.d/20-start_servers.conf + owner: root + group: root + mode: 0644 + notify: "Restart nfs-kernel-server" + when: + - inventory_hostname in groups['nfs_server'] + tags: + - nfs-server + + # --- # NFS clients # --- diff --git a/roles/common/templates/etc/nfs.conf.d/20-start_servers.conf.j2 b/roles/common/templates/etc/nfs.conf.d/20-start_servers.conf.j2 new file mode 100644 index 0000000..d704895 --- /dev/null +++ b/roles/common/templates/etc/nfs.conf.d/20-start_servers.conf.j2 @@ -0,0 +1,4 @@ +# {{ ansible_managed }} + +[nfsd] +threads={{ nfs_start_servers | default('16') }}