diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2023-08-20 23:02:06 +0200 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2023-08-20 23:02:08 +0200 |
| commit | c054d22c4818d916ac6dd9c8d7a7a2c614408e17 (patch) | |
| tree | c0239045b1587cd950fd1d777f0c84fe5c23aa92 | |
| parent | add ansible_managed comment to templates (diff) | |
| download | infra-ansible-c054d22c4818d916ac6dd9c8d7a7a2c614408e17.tar.gz infra-ansible-c054d22c4818d916ac6dd9c8d7a7a2c614408e17.zip | |
append .j2 extension to templates
I saw a good point somewhere that it should help with syntax
highlighting.
| -rw-r--r-- | roles/firewall/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/firewall/templates/rules.v4.j2 (renamed from roles/firewall/templates/rules.v4) | 0 | ||||
| -rw-r--r-- | roles/firewall/templates/rules.v6.j2 (renamed from roles/firewall/templates/rules.v6) | 0 | ||||
| -rw-r--r-- | roles/letsencrypt/tasks/digitalocean.yml | 2 | ||||
| -rw-r--r-- | roles/letsencrypt/tasks/domain.yml | 2 | ||||
| -rw-r--r-- | roles/letsencrypt/templates/certbot.ini.j2 (renamed from roles/letsencrypt/templates/certbot.ini) | 0 | ||||
| -rw-r--r-- | roles/letsencrypt/templates/domain_list.txt.j2 (renamed from roles/letsencrypt/templates/domain_list.txt) | 0 | ||||
| -rw-r--r-- | roles/sshd/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/sshd/templates/sshd_config.j2 (renamed from roles/sshd/templates/sshd_config) | 0 | ||||
| -rw-r--r-- | roles/wireguard/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/wireguard/templates/wg0.conf.j2 (renamed from roles/wireguard/templates/wg0.conf) | 0 |
11 files changed, 6 insertions, 6 deletions
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml index 95d02d3..82584e2 100644 --- a/roles/firewall/tasks/main.yml +++ b/roles/firewall/tasks/main.yml @@ -8,8 +8,8 @@ - name: Configure rule files ansible.builtin.include_tasks: file.yml loop: - - {src: rules.v4, dest: /etc/iptables/rules.v4, tool: iptables} - - {src: rules.v6, dest: /etc/iptables/rules.v6, tool: ip6tables} + - {src: rules.v4.j2, dest: /etc/iptables/rules.v4, tool: iptables} + - {src: rules.v6.j2, dest: /etc/iptables/rules.v6, tool: ip6tables} - name: Reboot if necessary ansible.builtin.meta: flush_handlers diff --git a/roles/firewall/templates/rules.v4 b/roles/firewall/templates/rules.v4.j2 index 1bfeb94..1bfeb94 100644 --- a/roles/firewall/templates/rules.v4 +++ b/roles/firewall/templates/rules.v4.j2 diff --git a/roles/firewall/templates/rules.v6 b/roles/firewall/templates/rules.v6.j2 index 2e94e25..2e94e25 100644 --- a/roles/firewall/templates/rules.v6 +++ b/roles/firewall/templates/rules.v6.j2 diff --git a/roles/letsencrypt/tasks/digitalocean.yml b/roles/letsencrypt/tasks/digitalocean.yml index 6cb1198..42f4ec0 100644 --- a/roles/letsencrypt/tasks/digitalocean.yml +++ b/roles/letsencrypt/tasks/digitalocean.yml @@ -21,7 +21,7 @@ - name: Configure certbot.ini ansible.builtin.template: - src: certbot.ini + src: certbot.ini.j2 dest: '{{ certbot_ini }}' owner: root group: root diff --git a/roles/letsencrypt/tasks/domain.yml b/roles/letsencrypt/tasks/domain.yml index d3cb50a..636230a 100644 --- a/roles/letsencrypt/tasks/domain.yml +++ b/roles/letsencrypt/tasks/domain.yml @@ -6,7 +6,7 @@ block: - name: Cache domain list ansible.builtin.template: - src: domain_list.txt + src: domain_list.txt.j2 dest: '/etc/letsencrypt/.domains_{{ certificate_name }}.txt' owner: root group: root diff --git a/roles/letsencrypt/templates/certbot.ini b/roles/letsencrypt/templates/certbot.ini.j2 index 71095d6..71095d6 100644 --- a/roles/letsencrypt/templates/certbot.ini +++ b/roles/letsencrypt/templates/certbot.ini.j2 diff --git a/roles/letsencrypt/templates/domain_list.txt b/roles/letsencrypt/templates/domain_list.txt.j2 index d45c7f0..d45c7f0 100644 --- a/roles/letsencrypt/templates/domain_list.txt +++ b/roles/letsencrypt/templates/domain_list.txt.j2 diff --git a/roles/sshd/tasks/main.yml b/roles/sshd/tasks/main.yml index d31ac79..ed60e75 100644 --- a/roles/sshd/tasks/main.yml +++ b/roles/sshd/tasks/main.yml @@ -1,7 +1,7 @@ - name: Configure sshd become: true ansible.builtin.template: - src: sshd_config + src: sshd_config.j2 dest: /etc/ssh/sshd_config owner: root group: root diff --git a/roles/sshd/templates/sshd_config b/roles/sshd/templates/sshd_config.j2 index abcf0d7..abcf0d7 100644 --- a/roles/sshd/templates/sshd_config +++ b/roles/sshd/templates/sshd_config.j2 diff --git a/roles/wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml index b91ad8a..64b0f76 100644 --- a/roles/wireguard/tasks/main.yml +++ b/roles/wireguard/tasks/main.yml @@ -9,7 +9,7 @@ - name: Write wg-quick config file ansible.builtin.template: - src: wg0.conf + src: wg0.conf.j2 dest: '/etc/wireguard/{{ wg_name }}.conf' owner: root group: root diff --git a/roles/wireguard/templates/wg0.conf b/roles/wireguard/templates/wg0.conf.j2 index fca9a0b..fca9a0b 100644 --- a/roles/wireguard/templates/wg0.conf +++ b/roles/wireguard/templates/wg0.conf.j2 |