From 81ef6789046688b39dd8f75c8c123781b2604863 Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 30 Jul 2026 23:47:37 +0200 Subject: [PATCH] Refactor template tasks to use ansible.builtin.template for consistency across playbooks --- roles/common/tasks/apt.yml | 8 ++++---- roles/common/tasks/basic.yml | 4 ++-- roles/common/tasks/cups-install.yml | 10 +++++----- roles/common/tasks/nfs.yml | 4 ++-- roles/common/tasks/nis-install-client.yml | 4 ++-- roles/common/tasks/nis-install-server.yml | 4 ++-- roles/common/tasks/ntp.yml | 2 +- roles/common/tasks/pure-ftpd/configure.yml | 4 ++-- roles/common/tasks/pure-ftpd/setup.yml | 2 +- roles/common/tasks/root-files-scripts.yml | 2 +- roles/common/tasks/samba-install.yml | 6 +++--- roles/common/tasks/sshd.yml | 8 ++++---- roles/common/tasks/sudoers-pc.yml | 4 ++-- roles/common/tasks/sudoers-server.yml | 4 ++-- roles/common/tasks/systemd-resolved.yml | 2 +- roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml | 2 +- roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml | 2 +- roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml | 2 +- roles/common/tasks/ubuntu-x11vnc-2204-amd64.yml | 2 +- roles/common/tasks/ubuntu-x11vnc-2404-amd64.yml | 2 +- roles/network_interfaces/tasks/interfaces.yml | 4 ++-- 21 files changed, 41 insertions(+), 41 deletions(-) diff --git a/roles/common/tasks/apt.yml b/roles/common/tasks/apt.yml index c78e38f..2c821d0 100644 --- a/roles/common/tasks/apt.yml +++ b/roles/common/tasks/apt.yml @@ -10,7 +10,7 @@ - apt-configuration - name: (apt.yml) update configuration file - /etc/apt/sources.list - template: + ansible.builtin.template: src: "etc/apt/sources.list.{{ ansible_facts['distribution'] }}.j2" dest: /etc/apt/sources.list owner: root @@ -76,7 +76,7 @@ - apt-configuration - name: (apt.yml) configure deb822 Debian repository (Debian >= 13) - template: + ansible.builtin.template: src: "etc/apt/deb822/debian.sources.j2" dest: /etc/apt/sources.list.d/debian.sources owner: root @@ -91,7 +91,7 @@ - apt-configuration - name: (apt.yml) configure deb822 security repository (Debian >= 13) - template: + ansible.builtin.template: src: "etc/apt/deb822/security.sources.j2" dest: /etc/apt/sources.list.d/security.sources owner: root @@ -106,7 +106,7 @@ - apt-configuration - name: (apt.yml) configure deb822 backports repository (Debian >= 13) - template: + ansible.builtin.template: src: "etc/apt/deb822/backports.sources.j2" dest: /etc/apt/sources.list.d/backports.sources owner: root diff --git a/roles/common/tasks/basic.yml b/roles/common/tasks/basic.yml index 31bf3f3..ce0ae03 100644 --- a/roles/common/tasks/basic.yml +++ b/roles/common/tasks/basic.yml @@ -172,7 +172,7 @@ - unattended-upgrades - name: (basic.yml) copy apt-listchanges.conf - template: + ansible.builtin.template: src: etc/apt/listchanges.conf.j2 dest: /etc/apt/listchanges.conf owner: root @@ -184,7 +184,7 @@ - unattended-upgrades - name: (basic.yml) copy unattended-upgrades conf - template: + ansible.builtin.template: src: etc/apt/apt.conf.d/50unattended-upgrades.j2 dest: /etc/apt/apt.conf.d/50unattended-upgrades backup: yes diff --git a/roles/common/tasks/cups-install.yml b/roles/common/tasks/cups-install.yml index fb9eff9..9481ca4 100644 --- a/roles/common/tasks/cups-install.yml +++ b/roles/common/tasks/cups-install.yml @@ -49,7 +49,7 @@ - cups-client - name: (cups.yml) update configuration file server - /etc/cups/cups-browsed.conf - template: + ansible.builtin.template: src: "etc/cups/cups-browsed.conf.server.j2" dest: /etc/cups/cups-browsed.conf owner: root @@ -63,7 +63,7 @@ - cups-server - name: (cups.yml) update configuration file client - /etc/cups/cups-browsed.conf - template: + ansible.builtin.template: src: "etc/cups/cups-browsed.conf.client.j2" dest: /etc/cups/cups-browsed.conf owner: root @@ -94,7 +94,7 @@ - cups-client - name: (cups.yml) update configuration file server - /etc/cups/cupsd.conf - template: + ansible.builtin.template: src: "etc/cups/cupsd.conf.server.j2" dest: /etc/cups/cupsd.conf owner: root @@ -108,7 +108,7 @@ - cups-server - name: (cups.yml) update configuration file client - /etc/cups/cupsd.conf - template: + ansible.builtin.template: src: "etc/cups/cupsd.conf.client.j2" dest: /etc/cups/cupsd.conf owner: root @@ -138,7 +138,7 @@ - cups-client - name: (cups.yml) update configuration file server - /etc/cups/cups-files.conf - template: + ansible.builtin.template: src: "etc/cups/cups-files.conf.j2" dest: /etc/cups/cups-files.conf owner: root diff --git a/roles/common/tasks/nfs.yml b/roles/common/tasks/nfs.yml index 2db3988..551405d 100644 --- a/roles/common/tasks/nfs.yml +++ b/roles/common/tasks/nfs.yml @@ -32,7 +32,7 @@ - nfs-server - name: (nfs.yml) Copy exports file. - template: + ansible.builtin.template: src: etc/exports.j2 dest: /etc/exports owner: root @@ -110,7 +110,7 @@ - name: (nfs.yml) Create/Update file '/etc/nfs.conf.d/20-start_servers.conf' from template '20-start_servers.conf.j2' - template: + ansible.builtin.template: src: etc/nfs.conf.d/20-start_servers.conf.j2 dest: /etc/nfs.conf.d/20-start_servers.conf owner: root diff --git a/roles/common/tasks/nis-install-client.yml b/roles/common/tasks/nis-install-client.yml index cc4cd44..4e7fefe 100644 --- a/roles/common/tasks/nis-install-client.yml +++ b/roles/common/tasks/nis-install-client.yml @@ -5,7 +5,7 @@ # --- - name: (nis-install-client.yml) Set (nis) default domain (/etc/defaultdomain) - template: + ansible.builtin.template: dest: /etc/defaultdomain src: etc/defaultdomain.j2 owner: root @@ -16,7 +16,7 @@ - nis-install-client - name: (nis-install-client.yml) Create preconfigured /etc/yp.conf on nis clients - template: + ansible.builtin.template: dest: /etc/yp.conf src: etc/yp.conf.j2 owner: root diff --git a/roles/common/tasks/nis-install-server.yml b/roles/common/tasks/nis-install-server.yml index c7dd195..6cb2f08 100644 --- a/roles/common/tasks/nis-install-server.yml +++ b/roles/common/tasks/nis-install-server.yml @@ -15,7 +15,7 @@ - nis-install-server - name: (nis-install-server.yml) Set (nis) default domain (/etc/defaultdomain) - template: + ansible.builtin.template: dest: /etc/defaultdomain src: etc/defaultdomain.j2 owner: root @@ -26,7 +26,7 @@ - nis-install-server - name: (nis-install-server.yml) Create preconfigured /etc/yp.conf on nis clients - template: + ansible.builtin.template: dest: /etc/yp.conf src: etc/yp.conf.j2 owner: root diff --git a/roles/common/tasks/ntp.yml b/roles/common/tasks/ntp.yml index 5e7391c..d7d6aad 100644 --- a/roles/common/tasks/ntp.yml +++ b/roles/common/tasks/ntp.yml @@ -45,7 +45,7 @@ - ntp-server - name: (ntp.yml) Update '/etc/ntpsec/ntp.conf' - template: + ansible.builtin.template: src: "etc/ntpsec/ntp.conf.j2" dest: /etc/ntpsec/ntp.conf owner: root diff --git a/roles/common/tasks/pure-ftpd/configure.yml b/roles/common/tasks/pure-ftpd/configure.yml index d45efa9..8f95f88 100644 --- a/roles/common/tasks/pure-ftpd/configure.yml +++ b/roles/common/tasks/pure-ftpd/configure.yml @@ -7,7 +7,7 @@ # Remove old current configurations if exists - name: Upload Pure-FTPd global configuration file. - template: + ansible.builtin.template: src: etc/default/pure-ftpd-common.j2 dest: "{{ pureftpd_global_config_file }}" owner: root @@ -35,7 +35,7 @@ # write new configuration - name: (pure-ftpd-install.yml) Write configuration. - template: + ansible.builtin.template: src: etc/pure-ftpd/conf/config.j2 dest: "{{ pureftpd_config_conf_dir }}/{{ item.key }}" owner: root diff --git a/roles/common/tasks/pure-ftpd/setup.yml b/roles/common/tasks/pure-ftpd/setup.yml index e23c56a..4c55492 100644 --- a/roles/common/tasks/pure-ftpd/setup.yml +++ b/roles/common/tasks/pure-ftpd/setup.yml @@ -12,7 +12,7 @@ update_cache: yes - name: (pure-ftpd-install.yml) Upload Pure-FTPd global configuration file. - template: + ansible.builtin.template: src: etc/default/pure-ftpd-common.j2 dest: "{{ pureftpd_global_config_file }}" owner: root diff --git a/roles/common/tasks/root-files-scripts.yml b/roles/common/tasks/root-files-scripts.yml index 37756ea..df43185 100644 --- a/roles/common/tasks/root-files-scripts.yml +++ b/roles/common/tasks/root-files-scripts.yml @@ -11,7 +11,7 @@ - groups['file_server']|string is search(inventory_hostname) - name: (root_files_scripts.yml) Ensure script 'wakeup_lan.sh' is present - template: + ansible.builtin.template: src: "{{ role_path + '/files/' + nis_domain + '/root/bin/wakeup_lan.sh' }}" dest: /root/bin/wakeup_lan.sh owner: root diff --git a/roles/common/tasks/samba-install.yml b/roles/common/tasks/samba-install.yml index d77aba5..9f08119 100644 --- a/roles/common/tasks/samba-install.yml +++ b/roles/common/tasks/samba-install.yml @@ -199,7 +199,7 @@ - samba-virusfilter - name: (samba-config-server.yml) Configure AppArmor local profile for clamd (data paths) - template: + ansible.builtin.template: src: etc/apparmor.d/local/usr.sbin.clamd.j2 dest: /etc/apparmor.d/local/usr.sbin.clamd owner: root @@ -253,7 +253,7 @@ - samba-server - name: (samba-install.yml) /etc/samba/smb.conf - template: + ansible.builtin.template: dest: /etc/samba/smb.conf src: etc/samba/smb.conf.j2 owner: root @@ -297,7 +297,7 @@ - samba-cron - name: (samba-install.yml) Adjust configuration for script 'clean_samba_trash.sh' - template: + ansible.builtin.template: dest: /root/bin/samba/conf/clean_samba_trash.conf src: root/bin/samba/conf/clean_samba_trash.conf.j2 when: diff --git a/roles/common/tasks/sshd.yml b/roles/common/tasks/sshd.yml index bc77c88..6923dca 100644 --- a/roles/common/tasks/sshd.yml +++ b/roles/common/tasks/sshd.yml @@ -64,7 +64,7 @@ - name: (sshd.yml) Create new sshd_config from template sshd_config.j2 - template: + ansible.builtin.template: src: etc/ssh/sshd_config.ubuntu.j2 dest: /etc/ssh/sshd_config owner: root @@ -80,7 +80,7 @@ - name: (sshd.yml) Create/Update new sshd_config from template sshd_config.j2 - template: + ansible.builtin.template: src: etc/ssh/sshd_config.j2 dest: /etc/ssh/sshd_config owner: root @@ -96,7 +96,7 @@ - sshd-config - name: (sshd.yml) Create/Update sshd_config for chrooted sftp_group from template sshd_config.j2 - template: + ansible.builtin.template: src: etc/ssh/sshd_config.j2 dest: /etc/ssh/sshd_config owner: root @@ -137,7 +137,7 @@ - sshd-config - name: (sshd.yml) Create/Update file '/etc/ssh/sshd_config.d/50-sshd-local.conf' from template sshd_config.j2 - template: + ansible.builtin.template: src: etc/ssh/sshd_config.j2 dest: /etc/ssh/sshd_config.d/50-sshd-local.conf owner: root diff --git a/roles/common/tasks/sudoers-pc.yml b/roles/common/tasks/sudoers-pc.yml index c673b8b..8eeaaff 100644 --- a/roles/common/tasks/sudoers-pc.yml +++ b/roles/common/tasks/sudoers-pc.yml @@ -1,7 +1,7 @@ --- - name: (sudoers-pc.yml) update specific sudoers configuration files (/etc/sudoers.d/) - template: + ansible.builtin.template: src: etc/sudoers.d/50-user.pc.j2 dest: /etc/sudoers.d/50-user validate: visudo -cf %s @@ -12,7 +12,7 @@ - sudoers-file-configuration - name: (sudoers-pc.yml) update global sudoers configuration file - template: + ansible.builtin.template: src: etc/sudoers.pc.j2 dest: /etc/sudoers owner: root diff --git a/roles/common/tasks/sudoers-server.yml b/roles/common/tasks/sudoers-server.yml index 5302db8..97f27a6 100644 --- a/roles/common/tasks/sudoers-server.yml +++ b/roles/common/tasks/sudoers-server.yml @@ -26,7 +26,7 @@ - sudoers-remove - name: (sudoers-server.yml) update specific sudoers configuration files (/etc/sudoers.d/) - template: + ansible.builtin.template: src: etc/sudoers.d/50-user.server.j2 dest: /etc/sudoers.d/50-user #validate: visudo -cf %s @@ -37,7 +37,7 @@ - sudoers-file-configuration - name: (sudoers-server.yml) update global sudoers configuration file - template: + ansible.builtin.template: src: etc/sudoers.server.j2 dest: /etc/sudoers owner: root diff --git a/roles/common/tasks/systemd-resolved.yml b/roles/common/tasks/systemd-resolved.yml index fc7062b..ec28177 100644 --- a/roles/common/tasks/systemd-resolved.yml +++ b/roles/common/tasks/systemd-resolved.yml @@ -67,7 +67,7 @@ owner: root - name: (systemd-resolved.yml) Create/Update file '/etc/systemd/resolved.conf.d/50-resolved-local.conf' from template sshd_config.j2 - template: + ansible.builtin.template: src: etc/systemd/resolved.conf.d/50-resolved-local.conf dest: /etc/systemd/resolved.conf.d/50-resolved-local.conf owner: root diff --git a/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml index 928927f..3541be4 100644 --- a/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml +++ b/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml @@ -32,7 +32,7 @@ mode: 0644 - name: "(ubuntu-x11vnc-1604-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service" - template: + ansible.builtin.template: src: lib/systemd/system/x11vnc.service.j2 dest: /lib/systemd/system/x11vnc.service diff --git a/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml index 93b66ec..5425eb2 100644 --- a/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml +++ b/roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml @@ -48,7 +48,7 @@ mode: 0644 - name: "(ubuntu-x11vnc-1804-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service" - template: + ansible.builtin.template: src: lib/systemd/system/x11vnc-gdm3.service-ALT.j2 dest: /lib/systemd/system/x11vnc.service diff --git a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml index 8d97abf..595b835 100644 --- a/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml +++ b/roles/common/tasks/ubuntu-x11vnc-2004-amd64.yml @@ -51,7 +51,7 @@ mode: 0644 - name: "(ubuntu-x11vnc-2004-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service" - template: + ansible.builtin.template: src: lib/systemd/system/x11vnc-gdm3.service.j2 dest: /lib/systemd/system/x11vnc.service diff --git a/roles/common/tasks/ubuntu-x11vnc-2204-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-2204-amd64.yml index b13a807..7f32182 100644 --- a/roles/common/tasks/ubuntu-x11vnc-2204-amd64.yml +++ b/roles/common/tasks/ubuntu-x11vnc-2204-amd64.yml @@ -51,7 +51,7 @@ mode: 0644 - name: "(ubuntu-x11vnc-2204-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service" - template: + ansible.builtin.template: src: lib/systemd/system/x11vnc-gdm3.service.j2 dest: /lib/systemd/system/x11vnc.service diff --git a/roles/common/tasks/ubuntu-x11vnc-2404-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-2404-amd64.yml index c21342f..b2d4ad2 100644 --- a/roles/common/tasks/ubuntu-x11vnc-2404-amd64.yml +++ b/roles/common/tasks/ubuntu-x11vnc-2404-amd64.yml @@ -51,7 +51,7 @@ mode: 0644 - name: "(ubuntu-x11vnc-2404-amd64.yml) Transfer x11vnc.service.j2 to /lib/systemd/system/x11vnc.service" - template: + ansible.builtin.template: src: lib/systemd/system/x11vnc-gdm3.service.j2 dest: /lib/systemd/system/x11vnc.service diff --git a/roles/network_interfaces/tasks/interfaces.yml b/roles/network_interfaces/tasks/interfaces.yml index cea3039..78c3443 100644 --- a/roles/network_interfaces/tasks/interfaces.yml +++ b/roles/network_interfaces/tasks/interfaces.yml @@ -14,7 +14,7 @@ - network-interfaces - name: (interfaces.yml) Ensure interfaces file is latest - template: + ansible.builtin.template: src: "etc/network/interfaces.j2" dest: /etc/network/interfaces with_items: network_interfaces @@ -22,7 +22,7 @@ - network-interfaces - name: (interfaces.yml) Ensure imported device files at interfaces.d are latest - template: + ansible.builtin.template: src: "etc/network/interfaces.d/device.j2" dest: "{{ network_interface_path }}/device-{{ item.0 }}" with_items: