roles/telegraf/defaults/main.yaml

@@ -45,10 +45,10 @@ telegraf_config_inputs:
   ipset: []
   iptables:
     - table: filter
-      chains: [ "INPUT", "OUTPUT", "FORWARD", "LOG_DROP", "LOG_ACCEPT", "ICMP_FLOOD" ]
+      chains: [ "INPUT", "OUTPUT", "FORWARD", "LOG_DROP", "LOG_ACCEPT", "ICMP_FLOOD", "LIMIT_SSH" ]
     - table: filter
       name_override: ip6tables
-      chains: [ "INPUT", "OUTPUT", "FORWARD", "LOG_DROP", "LOG_ACCEPT", "ICMP_FLOOD" ]
+      chains: [ "INPUT", "OUTPUT", "FORWARD", "LOG_DROP", "LOG_ACCEPT", "ICMP_FLOOD", "LIMIT_SSH" ]
   kernel_vmstat: []
   net: []
   netstat: []

roles/telegraf/tasks/main.yaml

@@ -62,4 +62,3 @@
     name: "{{ telegraf_service_name }}"
     state: "{{ telegraf_service_state }}"
     enabled: "{{ telegraf_service_enabled }}"
-  when: telegraf_package_state != "absent"

roles/unattended-upgrades/templates/apticron.conf.j2

@@ -1,6 +1,6 @@
 # {{ ansible_managed }}
 
-{% if unattended_upgrades_apticron_email %}
+{% if unattended_upgrades_apticron_email is defined %}
 EMAIL="{{ unattended_upgrades_apticron_email | default('root') }}"
 SYSTEM="{{ ansible_hostname }}"
 {% endif %}

roles/unattended-upgrades/templates/unattended-upgrades.j2

@@ -26,7 +26,7 @@ Unattended-Upgrade::MinimalSteps "{{ unattended_upgrades_minimal_steps | lower }
 {% if unattended_upgrades_install_on_shutdown is defined %}
 Unattended-Upgrade::InstallOnShutdown "{{ unattended_upgrades_install_on_shutdown | lower }}";
 {% endif %}
-{% if unattended_upgrades_mail %}
+{% if unattended_upgrades_mail is defined %}
 Unattended-Upgrade::Mail "{{ unattended_upgrades_mail }}";
 {% endif %}
 {% if unattended_upgrades_mail_only_on_error is defined %}

roles/util/defaults/main.yaml

@@ -7,7 +7,6 @@ util_package_state: latest
 util_packages:
   editors:
     - vim
-    - neovim
   devel:
     - git
     - mercurial
@@ -30,7 +29,6 @@ util_packages:
     - iperf
     - iperf3
     - smem
-    - hping3
   math:
     - bc
   misc:
@@ -43,7 +41,6 @@ util_packages:
     - p7zip-full
     - pigz
     - pxz
-    - zstd
     - pbzip2
     - pv
     - htop
@@ -63,7 +60,6 @@ util_packages:
     - jq
     - crudini
     - xmlstarlet
-    - ack
   interpreters:
     - lua5.3
   python:
@@ -74,7 +70,3 @@ util_packages:
   fun:
     - cmatrix
     - cowsay
-  www:
-    - elinks
-    - links
-    - lynx

roles/util/tasks/Ubuntu.yaml

@@ -8,8 +8,3 @@
   apt_repository:
     repo: ppa:git-core/ppa
     state: "{{ util_git_ppa_state }}"
-
-- name: add neovim ppa
-  apt_repository:
-    repo: ppa:neovim-ppa/stable
-    state: present