From: Frank Brehm <frank@brehm-online.com>
Date: Sun, 25 Apr 2021 18:34:50 +0000 (+0200)
Subject: State after refactoring postfix
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=HEAD;p=config%2Fsarah%2Fetc.git

State after refactoring postfix
---

diff --git a/.etckeeper b/.etckeeper
index 6bb23ea..199e088 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -100,6 +100,7 @@ maybe chmod 0755 'acpi/events'
 maybe chmod 0644 'acpi/events/powerbtn-acpi-support'
 maybe chmod 0755 'acpi/powerbtn-acpi-support.sh'
 maybe chmod 0644 'adduser.conf'
+maybe chmod 0644 'aliases'
 maybe chmod 0755 'alternatives'
 maybe chmod 0644 'alternatives/README'
 maybe chmod 0755 'amavis'
diff --git a/.gitignore b/.gitignore
index f069c39..fddf9d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ DEADJOE
 # end section managed by etckeeper
 
 motd
+aliases.db
diff --git a/aliases b/aliases
deleted file mode 120000
index 88f0785..0000000
--- a/aliases
+++ /dev/null
@@ -1 +0,0 @@
-postfix/aliases
\ No newline at end of file
diff --git a/aliases b/aliases
new file mode 100644
index 0000000..a54b2d4
--- /dev/null
+++ b/aliases
@@ -0,0 +1,44 @@
+# See man 5 aliases for format
+
+abuse:		postmaster
+adm:		root
+amavis:		postmaster
+apache:		webmaster
+apt:		frank
+bind:		hostmaster
+clamav:		root
+daemon:		root
+fail2ban:	root
+f-brehm:	frank
+f.brehm:	frank
+fbr:		frank
+fbrehm:		frank
+frak:		frank
+frank-brehm:	frank
+frank.brehm:	frank
+frank:		frank@brehm-online.com
+hostmaster:	root
+iredapd:	root
+mail:		postmaster
+mailer-daemon:	postmaster
+me:		frank
+nagios:		root
+named:		hostmaster
+news:		root
+nginx:		webmaster
+nobody:		noreply
+noreply:	/dev/null
+package:	frank
+packages:	frank
+portage:	frank
+postfix:	postmaster
+postmaster:	frank@brehm-online.com
+root:		frank
+security:	root
+usenet:		news
+uucp:		root
+virusalert:	root
+vmail:		root
+webmaster:	root
+www:		webmaster
+www-data:	webmaster
diff --git a/cron.d/amavisd-new b/cron.d/amavisd-new
index 84ec761..319b589 100644
--- a/cron.d/amavisd-new
+++ b/cron.d/amavisd-new
@@ -2,5 +2,5 @@
 #  SpamAssassin maintenance for amavisd-new
 #
 # m h dom mon dow user  command
-18 */3	* * *	amavis	test -e /usr/sbin/amavisd-new-cronjob && /usr/sbin/amavisd-new-cronjob sa-sync
-24 1  * * *   amavis  test -e /usr/sbin/amavisd-new-cronjob && /usr/sbin/amavisd-new-cronjob sa-clean
+# 18 */3	* * *	amavis	test -e /usr/sbin/amavisd-new-cronjob && /usr/sbin/amavisd-new-cronjob sa-sync
+# 24 1  * * *   amavis  test -e /usr/sbin/amavisd-new-cronjob && /usr/sbin/amavisd-new-cronjob sa-clean
diff --git a/default/spamassassin b/default/spamassassin
index aff448e..1e957b7 100644
--- a/default/spamassassin
+++ b/default/spamassassin
@@ -31,4 +31,4 @@ PIDFILE="/var/run/spamd.pid"
 # Cronjob
 # Set to anything but 0 to enable the cron job to automatically update
 # spamassassin's rules on a nightly basis
-CRON=1
+CRON=0