From 983e77df5d1d5f6b7f321d8a8874d3f2df2e6247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Tue, 8 Aug 2017 13:42:02 +0200 Subject: [PATCH] Rename nft_input_conf file. --- README.md | 4 ++-- defaults/main.yml | 4 ++-- .../etc/nftables.d/{inet-filter.nft.j2 => inet-input.nft.j2} | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) rename templates/etc/nftables.d/{inet-filter.nft.j2 => inet-input.nft.j2} (99%) diff --git a/README.md b/README.md index 0c266f0..5029130 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Highly inspired by [Mike Gleason firewall role][mikegleasonjr firewall github] ( * **nft_pkg_state** : State of new `nftables` package(s) [default : `installed`]. * **nft_main_conf_path** : Main configuration file loaded by systemd unit [default : `/etc/nftables.conf`]. * **nft_main_conf_content** : Template used to generate the previous main configuration file [default : `etc/nftables.conf.j2`]. -* **nft_input_conf_path** : Input configuration file include in main configuration file [default : `/etc/nftables.d/inet-filter.nft`]. -* **nft_input_conf_content** : Template used to generate the previous input configuration file [default : `etc/nftables.d/inet-filter.nft.j2`]. +* **nft_input_conf_path** : Input configuration file include in main configuration file [default : `/etc/nftables.d/inet-input.nft`]. +* **nft_input_conf_content** : Template used to generate the previous input configuration file [default : `etc/nftables.d/inet-input.nft.j2`]. * **nft_global_default_rules** : Set default rules for `global` chain. Other chains will jump to `global` before apply their specific rules. * **nft_global_group_rules** : You can add `global` rules or override those defined by **nft_global_default_rules** for a group. * **nft_global_host_rules:** : Hosts can also add or override `global` rules. diff --git a/defaults/main.yml b/defaults/main.yml index d6fb377..1a2fa2e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,8 +8,8 @@ nft_pkg_state: 'installed' # conf nft_main_conf_path: '/etc/nftables.conf' nft_main_conf_content: 'etc/nftables.conf.j2' -nft_input_conf_path: '/etc/nftables.d/inet-filter.nft' -nft_input_conf_content: 'etc/nftables.d/inet-filter.nft.j2' +nft_input_conf_path: '/etc/nftables.d/inet-input.nft' +nft_input_conf_content: 'etc/nftables.d/inet-input.nft.j2' nft_define_conf_path: '/etc/nftables.d/defines.nft' nft_define_conf_content: 'etc/nftables.d/defines.nft.j2' diff --git a/templates/etc/nftables.d/inet-filter.nft.j2 b/templates/etc/nftables.d/inet-input.nft.j2 similarity index 99% rename from templates/etc/nftables.d/inet-filter.nft.j2 rename to templates/etc/nftables.d/inet-input.nft.j2 index 417d2a4..4ab252d 100644 --- a/templates/etc/nftables.d/inet-filter.nft.j2 +++ b/templates/etc/nftables.d/inet-input.nft.j2 @@ -1,5 +1,4 @@ # {{ ansible_managed }} - {% set inputmerged = nft_input_default_rules.copy() %} {% set _ = inputmerged.update(nft_input_group_rules) %} {% set _ = inputmerged.update(nft_input_host_rules) %}