From 2819a294af83074e04bac2f5fea0536ac01b0a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Tue, 28 Apr 2020 08:43:12 +0200 Subject: [PATCH] Remove useless arpwatch.conf file --- CHANGELOG.md | 4 +++- defaults/main.yml | 8 -------- tasks/main.yml | 15 +-------------- templates/etc/arpwatch.conf.j2 | 24 ------------------------ 4 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 templates/etc/arpwatch.conf.j2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d4c36a..8d3fbc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ ## v2.X.Y ### Features - * Adapt for Debian Buster (start with arpwatch version 2.1a15-7) * Drop Debian Stretch support. Stay in v1.* to be able to manage Arpwatch on Debian Stretch +### Fix +* Arpwatch doesn't support configuration file. Remove /etc/arpwatch.conf + ## v1.0.2 ### Fix diff --git a/defaults/main.yml b/defaults/main.yml index 8cd5f6b..e9c307e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -52,14 +52,6 @@ arpwatch__service_manage: True # By default, only listen on the main network interface. arpwatch__conf_interfaces: [ '{{ ansible_default_ipv4.interface }}' ] - # ]]] -# .. envvar:: arpwatch__conf_src [[[. -# Template used to provide configuration file. -# -# Must be a relative path from default/ directory of this role or to your -# ansible inventory directory. -arpwatch__conf_src: 'etc/arpwatch.conf.j2' - # ]]] # .. envvar:: arpwatch__conf_username [[[. # Username that should run Arpwatch. diff --git a/tasks/main.yml b/tasks/main.yml index 561c764..20cf8fb 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -15,19 +15,7 @@ until: pkg_result is success when: arpwatch__enabled|bool -# Manage configuration file [[[1 -## Manage Arpwatch configuration [[[ -- name: Create Arpwatch configuration - template: - src: '{{ arpwatch__conf_src }}' - dest: "/etc/arpwatch.conf" - owner: root - group: root - mode: '0644' - when: arpwatch__enabled|bool - notify: ['restart arpwatch service'] - # ]]] -## Manage service default [[[ +# Manage service default [[[1 - name: Manage service default template: src: 'etc/default/arpwatch.j2' @@ -38,7 +26,6 @@ when: ((arpwatch__enabled | bool) and (arpwatch__service_manage | bool)) notify: ['restart arpwatch service'] - # ]]] # Manage service [[[1 - name: Manage arpwatch service by network interface diff --git a/templates/etc/arpwatch.conf.j2 b/templates/etc/arpwatch.conf.j2 deleted file mode 100644 index 740a0e0..0000000 --- a/templates/etc/arpwatch.conf.j2 +++ /dev/null @@ -1,24 +0,0 @@ -## {{ ansible_managed }} - -# /etc/arpwatch.conf: Debian-specific way to watch multiple interfaces. -# Format of this configuration file is: -# -# -# -#... -# -# -# You can set global options for all interfaces by editing -# /etc/default/arpwatch - -# For example: - -#eth0 -m root -#eth1 -m root -#eth2 -m root - -# or, if you have an MTA configured for plussed addressing: -# -#eth0 -m root+eth0 -#eth1 -m root+eth1 -#eth2 -m root+eth2