From eda7c5b59b311a4c5be950250c7cbf90b882cef6 Mon Sep 17 00:00:00 2001
From: neingeist <neingeist@bl0rg.net>
Date: Sat, 28 Oct 2017 03:56:36 +0200
Subject: [PATCH] merge automatic.conf.rpmnew

---
 files/automatic.conf | 45 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/files/automatic.conf b/files/automatic.conf
index c519551..9422fcc 100644
--- a/files/automatic.conf
+++ b/files/automatic.conf
@@ -5,12 +5,16 @@
 upgrade_type = default
 random_sleep = 300
 
-# Whether updates should be downloaded when they are available.
+# To just receive updates use dnf-automatic-notifyonly.timer
+
+# Whether updates should be downloaded when they are available, by
+# dnf-automatic.timer. notifyonly.timer, download.timer and
+# install.timer override this setting.
 download_updates = yes
 
-# Whether updates should be applied when they are available.
-# Note that if this is set to no, downloaded packages will be left in the
-# cache regardless of the keepcache setting.
+# Whether updates should be applied when they are available, by
+# dnf-automatic.timer. notifyonly.timer, download.timer and
+# install.timer override this setting.
 apply_updates = yes
 
 
@@ -23,8 +27,11 @@ apply_updates = yes
 # emit_via includes stdio, messages will be sent to stdout; this is useful
 # to have cron send the messages.  If emit_via includes email, this
 # program will send email itself according to the configured options.
-# If emit_via includes motd, /etc/motd file will have the messages.
+# If emit_via includes motd, /etc/motd file will have the messages. if
+# emit_via includes command_email, then messages will be send via a shell
+# command compatible with sendmail.
 # Default is email,stdio.
+# If emit_via is None or left blank, no messages will be sent.
 emit_via = stdio
 
 
@@ -39,6 +46,34 @@ email_to = root
 email_host = localhost
 
 
+[command]
+# The shell command to execute. This is a Python format string, as used in
+# str.format(). The format function will pass a shell-quoted argument called
+# `body`.
+# command_format = "cat"
+
+# The contents of stdin to pass to the command. It is a format string with the
+# same arguments as `command_format`.
+# stdin_format = "{body}"
+
+
+[command_email]
+# The shell command to use to send email. This is a Python format string,
+# as used in str.format(). The format function will pass shell-quoted arguments
+# called body, subject, email_from, email_to.
+# command_format = "mail -s {subject} -r {email_from} {email_to}"
+
+# The contents of stdin to pass to the command. It is a format string with the
+# same arguments as `command_format`.
+# stdin_format = "{body}"
+
+# The address to send email messages from.
+email_from = root@example.com
+
+# List of addresses to send messages to.
+email_to = root
+
+
 [base]
 # This section overrides dnf.conf