From ebe9ee43670245b794e6465f18ad6d11a88f7e04 Mon Sep 17 00:00:00 2001
From: phil <phil@systemausfall.org>
Date: Mon, 6 Feb 2023 22:26:37 +0100
Subject: [PATCH] Fix lint warnings

---
 tasks/configuration.yml | 16 ++++++++--------
 tasks/monitoring.yml    | 14 +++++++-------
 tasks/packages.yml      |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tasks/configuration.yml b/tasks/configuration.yml
index b8e1aa4..2af0cf9 100644
--- a/tasks/configuration.yml
+++ b/tasks/configuration.yml
@@ -1,18 +1,18 @@
 ---
-- name: "configuration | Deaktiviere Server-Tokens"
+- name: "Configuration | Disable ServerTokens"
   ansible.builtin.lineinfile:
     path: /etc/apache2/conf-enabled/security.conf
     regexp: '^ServerTokens OS'
     line: ServerTokens Prod
   notify: reload apache2
 
-- name: "configuration | Deaktiviere access-Logs"
+- name: "Configuration | Disable access-log"
   ansible.builtin.command:
     cmd: a2disconf other-vhosts-access-log
     removes: /etc/apache2/conf-enabled/other-vhosts-access-log.conf
   notify: reload apache2
 
-- name: "apache | Generiere Diffie-Hellman-Parameter"
+- name: "Configuration | Generate Diffie Hellman parameters"
   openssl_dhparam:
     path: "{{ dhparams_path }}"
   # Most of our apache2 instances are currently running behind public reverse proxies.
@@ -20,7 +20,7 @@
   # The only possible exceptions are external hosts (e.g. orwell).
   when: "'extern_hosts' in group_names"
 
-- name: "configuration | Kopiere Dateien"
+- name: "Configuration | Copy misc configuration files"
   ansible.builtin.copy:
     src: "{{ item }}"
     dest: "/etc/apache2/conf-available/{{ item }}"
@@ -30,7 +30,7 @@
     - letsencrypt.conf
     - sao-cache.conf
 
-- name: "configuration | Kopiere Templates"
+- name: "Configuration | Copy configuration templates"
   ansible.builtin.template:
     src: "{{ item }}"
     dest: /etc/apache2/conf-available/
@@ -39,8 +39,8 @@
     - remoteip.conf
     - ssl.conf
 
-- name: "configuration | Aktiviere Module"
-  ansible.builtin.apache2_module:
+- name: "Configuration | Enable modules"
+  community.general.apache2_module:
     name: "{{ item }}"
     state: present
   notify: reload apache2
@@ -50,7 +50,7 @@
     - mpm_event
     - ssl
 
-- name: "configuration | Aktiviere Konfiguration"
+- name: "Configuration | Enable configuration"
   ansible.builtin.command:
     cmd: "a2enconf {{ item }}"
     creates: "/etc/apache2/conf-enabled/{{ item }}"
diff --git a/tasks/monitoring.yml b/tasks/monitoring.yml
index 48f9f99..81527b4 100644
--- a/tasks/monitoring.yml
+++ b/tasks/monitoring.yml
@@ -1,30 +1,30 @@
 ---
-- name: "monitoring | Aktiviere Apache-Module"
-  ansible.builtin.apache2_module:
+- name: "Monitoring | Enable Modules"
+  community.general.apache2_module:
     name: status
     state: present
   notify: reload apache2
 
-- name: "monitoring | Kopiere Konfigurationsdatei"
+- name: "Monitoring | Copy configuration"
   ansible.builtin.copy:
     src: server-status.conf
     dest: /etc/apache2/sites-available/server-status.conf
     mode: 0644
 
-- name: "monitoring | Aktiviere Seitenkonfiguration für Localhost"
+- name: "Monitoring | Enable localhost site configuration"
   ansible.builtin.command:
     cmd: a2ensite server-status
     creates: /etc/apache2/sites-enabled/server-status.conf
   notify: reload apache2
 
-- name: "monitoring | Kopiere Munin-Konfiguration"
+- name: "Monitoring | Copy munin configuration"
   ansible.builtin.template:
-    src: munin.j2
+    src: munin_configuration
     dest: /etc/munin/plugin-conf.d/yyy-apache
     mode: 0644
   notify: restart munin-node
 
-- name: "monitoring | Aktiviere Munin-Plugins"
+- name: "Mpnitoring | Enable Munin plugins"
   ansible.builtin.file:
     src: "/usr/share/munin/plugins/{{ item }}"
     dest: "/etc/munin/plugins/{{ item }}"
diff --git a/tasks/packages.yml b/tasks/packages.yml
index df7508d..5c99b7c 100644
--- a/tasks/packages.yml
+++ b/tasks/packages.yml
@@ -1,5 +1,5 @@
 ---
-- name: "packages: Abhängigkeiten installieren"
+- name: "Packages | Install packages"
   ansible.builtin.apt:
     pkg:
       - apache2