State after refactoring postfix

diff --git a/.etckeeper b/.etckeeper
index 6bb23ea1dc4e6710866c425fafe893368a4e7f6a..199e088eef861ceb0dd710ab1c3db4b22e167064 100755 (executable)
--- 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 f069c3924abb2f9742202ee7c4e5a5a0bcca8dbb..fddf9d7e971a8c312a0e03596d8b150d24d3d0f0 100644 (file)
--- 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 (symlink)
index 88f07858d182480ea201319905d49406bf2b2862..0000000000000000000000000000000000000000
--- 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 (file)
index 0000000000000000000000000000000000000000..a54b2d48291c2afd3ce451fdbfe7cd5abb0e451c
--- /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 84ec7615e24bc98dfb702d2aea0aafe11308babe..319b589647bdc1de8ad24bb0607aae0c34194b6d 100644 (file)
--- 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 aff448ed38d7c591032f471c8a638360321f0a4c..1e957b7708e3fab5ebcd94252b99f5285fdcf9cb 100644 (file)
--- 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