From 1f1c8d1542c622f7d32566f021521e76ac5f805e Mon Sep 17 00:00:00 2001
From: phil <phil@systemausfall.org>
Date: Mon, 14 Aug 2023 12:31:32 +0200
Subject: [PATCH] Fix typos Add file extension to templates

---
 .vscode/settings.json                                   | 3 +++
 tasks/backup.yml                                        | 6 +++---
 tasks/configuration.yml                                 | 2 +-
 tasks/cron.yml                                          | 2 +-
 tasks/monit.yml                                         | 2 +-
 tasks/munin.yml                                         | 2 +-
 templates/{automysqlbackup => automysqlbackup.j2}       | 2 +-
 templates/{mariadb.conf => mariadb.conf.j2}             | 0
 templates/{monit.conf => monit.conf.j2}                 | 0
 templates/{munin-mariadb.conf => munin-mariadb.conf.j2} | 0
 10 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 .vscode/settings.json
 rename templates/{automysqlbackup => automysqlbackup.j2} (91%)
 rename templates/{mariadb.conf => mariadb.conf.j2} (100%)
 rename templates/{monit.conf => monit.conf.j2} (100%)
 rename templates/{munin-mariadb.conf => munin-mariadb.conf.j2} (100%)

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..2120b8f
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "ansible.python.interpreterPath": "/bin/python"
+}
diff --git a/tasks/backup.yml b/tasks/backup.yml
index c1c31cb..53a2710 100644
--- a/tasks/backup.yml
+++ b/tasks/backup.yml
@@ -1,12 +1,12 @@
 ---
 - name: "Backup | Copy automysqlbackup configuration"
   ansible.builtin.template:
-    src: automysqlbackup
+    src: automysqlbackup.j2
     dest: /etc/default/automysqlbackup
-    mode: 0644
+    mode: "0644"
 
 - name: "Backup | Copy automysqlbackup postbackup script"
   ansible.builtin.copy:
     src: automysqlbackup_post_script
     dest: "{{ automysqlbackup_postbackup }}"
-    mode: 0755
+    mode: "0755"
diff --git a/tasks/configuration.yml b/tasks/configuration.yml
index 91540b7..6474d7e 100644
--- a/tasks/configuration.yml
+++ b/tasks/configuration.yml
@@ -1,7 +1,7 @@
 ---
 - name: Configuration | Copy configuration file
   ansible.builtin.template:
-    src: mariadb.conf
+    src: mariadb.conf.j2
     dest: "/etc/mysql/mariadb.conf.d/90-{{ ansible_hostname }}.cnf"
     mode: "0644"
   notify: restart mariadb
diff --git a/tasks/cron.yml b/tasks/cron.yml
index 9b501b5..8e97226 100644
--- a/tasks/cron.yml
+++ b/tasks/cron.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cron | Create cromn job for database optimization"
+- name: "Cron | Create cron job for database optimization"
   ansible.builtin.cron:
     name: 'Ansible: Database optimization'
     job: 'chronic mysqlcheck --all-databases --optimize'
diff --git a/tasks/monit.yml b/tasks/monit.yml
index bfbf072..07b1031 100644
--- a/tasks/monit.yml
+++ b/tasks/monit.yml
@@ -9,7 +9,7 @@
 
 - name: "Monit | Copy Monit configuration"
   ansible.builtin.template:
-    src: monit.conf
+    src: monit.conf.j2
     dest: /etc/monit/conf-enabled/mariadb
     mode: "0600"
   notify: reload monit
diff --git a/tasks/munin.yml b/tasks/munin.yml
index 686a6da..bd30ba2 100644
--- a/tasks/munin.yml
+++ b/tasks/munin.yml
@@ -10,7 +10,7 @@
 
 - name: "Munin | Copy Munin configuration"
   ansible.builtin.template:
-    src: templates/munin-mariadb.conf
+    src: templates/munin-mariadb.conf.j2
     dest: "{{ munin_sql_config_file }}"
     mode: "0660"
   notify: restart munin-node
diff --git a/templates/automysqlbackup b/templates/automysqlbackup.j2
similarity index 91%
rename from templates/automysqlbackup
rename to templates/automysqlbackup.j2
index bf0094f..1262f3e 100644
--- a/templates/automysqlbackup
+++ b/templates/automysqlbackup.j2
@@ -5,7 +5,7 @@ DBNAMES=`mysql --defaults-file=/etc/mysql/debian.cnf --execute="SHOW DATABASES"
 BACKUPDIR="{{ automysqlbackup_backupdir | default("/var/lib/automysqlbackup") }}"
 MAILCONTENT="quiet"
 MAXATTSIZE="4000"
-MAILADDR="{{ automysqlbackup_mailaddr | default(root) }}"
+MAILADDR="{{ automysqlbackup_mailaddr | default("root") }}"
 MDBNAMES="mysql $DBNAMES"
 DBEXCLUDE=""
 CREATE_DATABASE=yes
diff --git a/templates/mariadb.conf b/templates/mariadb.conf.j2
similarity index 100%
rename from templates/mariadb.conf
rename to templates/mariadb.conf.j2
diff --git a/templates/monit.conf b/templates/monit.conf.j2
similarity index 100%
rename from templates/monit.conf
rename to templates/monit.conf.j2
diff --git a/templates/munin-mariadb.conf b/templates/munin-mariadb.conf.j2
similarity index 100%
rename from templates/munin-mariadb.conf
rename to templates/munin-mariadb.conf.j2