Send internal system mails to root@f.o.

Instead of admin@f.o. Per msgid=<ad724342-b3bb-48d9-9984-6d277714910d@fripost.org>.

10 files changed, 15 insertions, 15 deletions

diff --git a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2 b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
index ab22375..7d862d3 100644
--- a/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
+++ b/roles/bacula-dir/templates/etc/bacula/bacula-dir.conf.j2
@@ -628,9 +628,9 @@ Catalog {
 Messages {
   Name = Standard
   MailCommand = "/usr/sbin/bsmtp -h localhost:16132 -f \"\(Bacula\) \<bacula@fripost.org\>\" -s \"Bacula: %t %e of %n %l\" %r"
-  Mail = admin@fripost.org = all, !skipped
+  Mail = root@fripost.org = all, !skipped
   OperatorCommand = "/usr/sbin/bsmtp -h localhost:16132 -f \"\(Bacula\) \<bacula@fripost.org\>\" -s \"Bacula: Intervention needed for %j\" %r"
-  Operator = admin@fripost.org = mount
+  Operator = root@fripost.org = mount
   Console = all, !skipped, !saved
   Append = "/var/log/bacula/bacula.log" = all, !skipped
   Catalog = all
@@ -640,11 +640,11 @@ Messages {
 Messages {
   Name = Quiet
   MailCommand = "/usr/sbin/bsmtp -h localhost:16132 -f \"\(Bacula\) \<bacula@fripost.org\>\" -s \"Bacula: %t %e of %n %l\" %r"
-  Mail On Success = admin@fripost.org = all, !info, !fatal, !skipped, !notsaved, !restored
+  Mail On Success = root@fripost.org = all, !info, !fatal, !skipped, !notsaved, !restored
   MailCommand = "/usr/sbin/bsmtp -h localhost:16132 -f \"\(Bacula\) \<bacula@fripost.org\>\" -s \"Bacula: %t %e of %n %l\" %r"
-  Mail On Error = admin@fripost.org = all, !skipped
+  Mail On Error = root@fripost.org = all, !skipped
   OperatorCommand = "/usr/sbin/bsmtp -h localhost:16132 -f \"\(Bacula\) \<bacula@fripost.org\>\" -s \"Bacula: Intervention needed for %j\" %r"
-  Operator = admin@fripost.org = mount
+  Operator = root@fripost.org = mount
   Console = all, !info, !restored, !skipped, !saved
   Append = "/var/lib/bacula/log" = all, !skipped
   Catalog = all
@@ -654,7 +654,7 @@ Messages {
 Messages {
   Name = Daemon
   MailCommand = "/usr/sbin/bsmtp -h localhost:16132 -f \"\(Bacula\) \<bacula@fripost.org\>\" -s \"Bacula daemon message\" %r"
-  Mail = admin@fripost.org = all, !skipped
+  Mail = root@fripost.org = all, !skipped
   Console = all, !skipped, !saved
   Append = "/var/log/bacula/bacula.log" = all, !skipped
 }
diff --git a/roles/common/files/etc/apt/apt.conf.d/50unattended-upgrades b/roles/common/files/etc/apt/apt.conf.d/50unattended-upgrades
index fd7cf1d..6f71ce6 100644
--- a/roles/common/files/etc/apt/apt.conf.d/50unattended-upgrades
+++ b/roles/common/files/etc/apt/apt.conf.d/50unattended-upgrades
@@ -91,7 +91,7 @@ Unattended-Upgrade::Package-Blacklist {
 // If empty or unset then no email is sent, make sure that you
 // have a working mail setup on your system. A package that provides
 // 'mailx' must be installed. E.g. "user@example.com"
-Unattended-Upgrade::Mail "admin@fripost.org";
+Unattended-Upgrade::Mail "root@fripost.org";
 
 // Set this value to one of:
 //    "always", "only-on-error" or "on-change"
diff --git a/roles/common/files/etc/apt/listchanges.conf b/roles/common/files/etc/apt/listchanges.conf
index cee0648..e17e36d 100644
--- a/roles/common/files/etc/apt/listchanges.conf
+++ b/roles/common/files/etc/apt/listchanges.conf
@@ -1,6 +1,6 @@
 [apt]
 frontend=mail
-email_address=admin@fripost.org
+email_address=root@fripost.org
 confirm=0
 save_seen=/var/lib/apt/listchanges.db
 which=news
diff --git a/roles/common/files/etc/default/rkhunter b/roles/common/files/etc/default/rkhunter
index 2e7fae7..49a63e8 100644
--- a/roles/common/files/etc/default/rkhunter
+++ b/roles/common/files/etc/default/rkhunter
@@ -18,7 +18,7 @@ DB_UPDATE_EMAIL="false"
 
 # Set this to the email address where reports and run output should be sent
 # (default: root)
-REPORT_EMAIL="admin@fripost.org"
+REPORT_EMAIL="root@fripost.org"
 
 # Set this to yes to enable automatic database updates
 # (default: false)
diff --git a/roles/common/files/etc/logcheck/logcheck.conf b/roles/common/files/etc/logcheck/logcheck.conf
index 4c7ff10..6e06450 100644
--- a/roles/common/files/etc/logcheck/logcheck.conf
+++ b/roles/common/files/etc/logcheck/logcheck.conf
@@ -25,7 +25,7 @@ REPORTLEVEL="server"
 # *NOTE* the script does not set a default value for this variable!
 # Should be set to an offsite "emailaddress@some.domain.tld"
 
-SENDMAILTO="admin@fripost.org"
+SENDMAILTO="root@fripost.org"
 
 # Send the results as attachment or not.
 # 0=not as attachment; 1=as attachment; 2=as gzip attachment
diff --git a/roles/common/files/etc/rkhunter.conf b/roles/common/files/etc/rkhunter.conf
index e76ab77..8040c88 100644
--- a/roles/common/files/etc/rkhunter.conf
+++ b/roles/common/files/etc/rkhunter.conf
@@ -133,7 +133,7 @@ MIRRORS_MODE=1
 #
 # Also see the MAIL_CMD option.
 #
-MAIL-ON-WARNING=admin@fripost.org
+MAIL-ON-WARNING=root@fripost.org
 
 #
 # This option specifies the mail command to use if MAIL-ON-WARNING is set.
diff --git a/roles/common/files/usr/local/bin/genkeypair.sh b/roles/common/files/usr/local/bin/genkeypair.sh
index 72102f4..aecdaaf 100755
--- a/roles/common/files/usr/local/bin/genkeypair.sh
+++ b/roles/common/files/usr/local/bin/genkeypair.sh
@@ -162,7 +162,7 @@ if [ -z "$config" -a \( "$cmd" = x509 -o "$cmd" = csr \) ]; then
 		commonName             = ${cn:-/}
 
 		[ v3_req ]
-		subjectAltName       = email:admin@fripost.org${dns:+, $dns}
+		subjectAltName       = email:root@fripost.org${dns:+, $dns}
 		basicConstraints     = critical, CA:FALSE
 		# https://security.stackexchange.com/questions/24106/which-key-usages-are-required-by-each-key-exchange-method
 		keyUsage             = critical, ${usage:-digitalSignature, keyEncipherment, keyCertSign}
diff --git a/roles/common/templates/etc/fail2ban/jail.local.j2 b/roles/common/templates/etc/fail2ban/jail.local.j2
index 3cd19cc..2759611 100644
--- a/roles/common/templates/etc/fail2ban/jail.local.j2
+++ b/roles/common/templates/etc/fail2ban/jail.local.j2
@@ -5,7 +5,7 @@
 
 # Destination email address used solely for the interpolations in
 # jail.{conf,local} configuration files.
-destemail = admin@fripost.org
+destemail = root@fripost.org
 
 # "ignoreip" can be a list of IP addresses, CIDR masks or DNS hosts. Fail2ban
 # will not ban a host which matches an address in this list. Several addresses
diff --git a/roles/munin-master/templates/etc/munin/munin.conf.j2 b/roles/munin-master/templates/etc/munin/munin.conf.j2
index b53ef0e..cdf659c 100644
--- a/roles/munin-master/templates/etc/munin/munin.conf.j2
+++ b/roles/munin-master/templates/etc/munin/munin.conf.j2
@@ -87,7 +87,7 @@ rrdcached_socket /run/rrdcached.sock
 
 # Drop somejuser@fnord.comm and anotheruser@blibb.comm an email everytime
 # something changes (OK -> WARNING, CRITICAL -> OK, etc)
-contact.admin.command mail -s "Munin notification" admin@fripost.org
+contact.admin.command mail -s "Munin notification" root@fripost.org
 #
 # For those with Nagios, the following might come in handy. In addition,
 # the services must be defined in the Nagios server as well.
diff --git a/roles/out/templates/etc/postfix/canonical.j2 b/roles/out/templates/etc/postfix/canonical.j2
index ed8bb4d..14ef6e7 100644
--- a/roles/out/templates/etc/postfix/canonical.j2
+++ b/roles/out/templates/etc/postfix/canonical.j2
@@ -6,5 +6,5 @@
 # address verification, so we use the admin team's address in the
 # envelope.
 {% for host in groups.all | sort %}
-@{{ hostvars[host].inventory_hostname }}    admin@fripost.org
+@{{ hostvars[host].inventory_hostname }}    root@fripost.org
 {% endfor %}