support for new configuration options concerning command and command_…

…email
exploide · Jul 11, 2017 · 96bee72 · 96bee72
1 parent 6bc5a63
commit 96bee72
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -24,6 +24,10 @@ dnf_automatic_upgrade_type: security
 dnf_automatic_random_sleep: 300
 dnf_automatic_emit_via: stdio
 dnf_automatic_system_name: "{{ ansible_nodename }}"
+dnf_automatic_command_format: cat
+dnf_automatic_stdin_format: "{body}"
+dnf_automatic_email_command_format: mail -s {subject} -r {email_from} {email_to}
+dnf_automatic_email_stdin_format: "{body}"
 dnf_automatic_email_from: root
 dnf_automatic_email_to: root
 dnf_automatic_email_host: localhost

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -15,6 +15,16 @@ dnf_automatic_random_sleep: 300
 dnf_automatic_emit_via: stdio
 dnf_automatic_system_name: "{{ ansible_nodename }}"
 
+# [command]
+
+dnf_automatic_command_format: cat
+dnf_automatic_stdin_format: "{body}"
+
+# [command_email]
+
+dnf_automatic_email_command_format: mail -s {subject} -r {email_from} {email_to}
+dnf_automatic_email_stdin_format: "{body}"
+
 # [email]
 
 dnf_automatic_email_from: root

diff --git a/templates/automatic.conf.j2 b/templates/automatic.conf.j2
@@ -15,6 +15,18 @@ random_sleep = {{ dnf_automatic_random_sleep }}
 emit_via = {{ dnf_automatic_emit_via }}
 system_name = {{ dnf_automatic_system_name }}
 
+[command]
+
+command_format = {{ dnf_automatic_command_format }}
+stdin_format = {{ dnf_automatic_stdin_format }}
+
+[command_email]
+
+command_format = {{ dnf_automatic_email_command_format }}
+stdin_format = {{ dnf_automatic_email_stdin_format }}
+email_from = {{ dnf_automatic_email_from }}
+email_to = {{ dnf_automatic_email_to }}
+
 [email]
 
 email_from = {{ dnf_automatic_email_from }}