From 41fc70662303eb7cc1ae58f940b5700c6b33a341 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Mon, 11 Jul 2016 16:30:22 +0200
Subject: [PATCH] remove unneeded files

---
 rootfs/etc/confd/conf.d/sender-transport.toml    | 3 ---
 rootfs/etc/confd/templates/master.cf.tmpl        | 3 ---
 rootfs/etc/confd/templates/sender-transport.tmpl | 3 ---
 rootfs/etc/cont-init.d/02-sender-transport       | 3 ---
 rootfs/etc/services.d/spamass-milter/run         | 4 ++--
 rootfs/usr/bin/spamfilter                        | 8 --------
 6 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 rootfs/etc/confd/conf.d/sender-transport.toml
 delete mode 100644 rootfs/etc/confd/templates/sender-transport.tmpl
 delete mode 100644 rootfs/etc/cont-init.d/02-sender-transport
 delete mode 100755 rootfs/usr/bin/spamfilter

diff --git a/rootfs/etc/confd/conf.d/sender-transport.toml b/rootfs/etc/confd/conf.d/sender-transport.toml
deleted file mode 100644
index 1e0de73..0000000
--- a/rootfs/etc/confd/conf.d/sender-transport.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[template]
-src = "sender-transport.tmpl"
-dest = "/etc/postfix/sender-transport"
diff --git a/rootfs/etc/confd/templates/master.cf.tmpl b/rootfs/etc/confd/templates/master.cf.tmpl
index 5be8164..fcb28bb 100644
--- a/rootfs/etc/confd/templates/master.cf.tmpl
+++ b/rootfs/etc/confd/templates/master.cf.tmpl
@@ -26,6 +26,3 @@ virtual   unix  -       n       n       -       -       virtual
 lmtp      unix  -       -       n       -       -       lmtp
 anvil     unix  -       -       n       -       1       anvil
 scache    unix  -       -       n       -       1       scache
-
-spamfilter unix  -       n       n       -       -       pipe
-   flags=Rq user=postfix argv=/usr/bin/spamfilter ${sender} ${recipient}
diff --git a/rootfs/etc/confd/templates/sender-transport.tmpl b/rootfs/etc/confd/templates/sender-transport.tmpl
deleted file mode 100644
index 4bad0ae..0000000
--- a/rootfs/etc/confd/templates/sender-transport.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{range $mailhost := split (getenv "MAILHOSTS") ","}}
-@{{$mailhost}}  {{$mailhost}}-out
-{{end}}
diff --git a/rootfs/etc/cont-init.d/02-sender-transport b/rootfs/etc/cont-init.d/02-sender-transport
deleted file mode 100644
index 85027a2..0000000
--- a/rootfs/etc/cont-init.d/02-sender-transport
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-postmap /etc/postfix/sender-transport
diff --git a/rootfs/etc/services.d/spamass-milter/run b/rootfs/etc/services.d/spamass-milter/run
index a606c14..0b2782d 100644
--- a/rootfs/etc/services.d/spamass-milter/run
+++ b/rootfs/etc/services.d/spamass-milter/run
@@ -1,3 +1,3 @@
- #!/usr/bin/with-contenv sh
- 
+#!/usr/bin/with-contenv sh
+
 exec s6-setuidgid postfix spamass-milter -u postmaster -p /var/run/spamass-milter/spamass.sock -- -d spamassassin
diff --git a/rootfs/usr/bin/spamfilter b/rootfs/usr/bin/spamfilter
deleted file mode 100755
index 33a1d23..0000000
--- a/rootfs/usr/bin/spamfilter
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-SENDMAIL=/usr/sbin/sendmail
-SPAMASSASSIN=/usr/bin/spamc
-
-${SPAMASSASSIN} -u $1 -d spamassassin | ${SENDMAIL} -oi -f $1 $2
-
-exit $?