dkimproxy cleanup and config hierarchy bump

5 files changed, 20 insertions, 23 deletions

diff --git a/mail-filter/dkimproxy/Manifest b/mail-filter/dkimproxy/Manifest
index 90bb784..00eeb16 100644
--- a/mail-filter/dkimproxy/Manifest
+++ b/mail-filter/dkimproxy/Manifest
@@ -1,6 +1,6 @@
-AUX dkimproxy.in-initd 692 RMD160 5e5179facb0781e684ed81c6339de5f9f3a71516 SHA1 6efd0dd8c2759e7cf0536be59df9942651b0159b SHA256 a8ae13a458e375a10cb2612dafb6d6bc011e6aeb1f487dcc58ba6038b7c2fba9
-AUX dkimproxy.out-initd 696 RMD160 373f7a7a668871898378b2ebbbe75715023409e9 SHA1 6e98b6a6af5df32d62bcc4855290164083ce5eca SHA256 291ad31798889e8bf90ab90f7b050a4a32f201bd14142bfffdfafaaf094c30e4
+AUX dkimproxy.in-initd 682 RMD160 2f8750667c36b452e796203bf47d4048c064d6bd SHA1 60ab7e35890f8f366d72e6433226211c1dd5c784 SHA256 9dcb0adc90c129be94a9ed080d8998c63c439f4859e2d80317a7552ec3d6c291
+AUX dkimproxy.out-initd 686 RMD160 78532e609915f3b3f6840055e0288fa3188b7fdc SHA1 8707f5371444673bbb4bb36683995dff5860d14a SHA256 00176265cdce8660da5ad01e5cfa282e525c7ebd609cba5349e142ffe020d659
 AUX dkimproxy_in.conf.gentoo 256 RMD160 74a36587c20a5e3e32a57c89d11c9441b72d6044 SHA1 f53f6ba805499fdd7e22cc96e2aa5ca5763798b8 SHA256 3b1668d76b5e0d623bfd803d86b0a3f042d51b365c7355ff082502ce537ad07c
-AUX dkimproxy_out.conf.gentoo 616 RMD160 d9a1afe3bf01ccd0e5b7df4163b89780c1b4d252 SHA1 a54d04c037a89707957797bb99810b3ea752c1ac SHA256 538b95ce7584d83bf2a39bf9a6b4e7755ed04bd6664c94945bdde7e628cc58b7
+AUX dkimproxy_out.conf.gentoo 623 RMD160 465ebbbf36a4a4dfdf974bfaf1b82dd5e26992cd SHA1 18c961c440d6b4a73418e29c0f805c2969481165 SHA256 2a876723f564f2c6e601f6826cdaefc0560503c8970c69879371bbbc9c0d8d50
 DIST dkimproxy-1.2.tar.gz 96971 RMD160 4e4f2ec6f350186000c06d302867626e91c7d0a8 SHA1 470a6cd1f12213f10a6db86ae5340b72940a47f8 SHA256 4ae76367e2cecc85c3bce15513bf110b96251acd3d5e4278fbf6c9c5f9d3b7be
-EBUILD dkimproxy-1.2.ebuild 1304 RMD160 9685b3e9ecd67facc5e1fa7040056c587866d32c SHA1 785f5220fbe0309ccc2a003daf17aa127d76d969 SHA256 b44a2f5dbaf6f2b1f639a058dfbbe103b08ccac59ecaa6ff1f63972dea327a2e
+EBUILD dkimproxy-1.2.ebuild 1321 RMD160 f27aededd38bcdc1a0f2b43f2109dec91ddc499f SHA1 fb963fadd4af6b8fe1a6d616755a3a029f734970 SHA256 e9d866e7048645987e253bfb78298e987eb3a9865d58a408f74b932a246df87a
diff --git a/mail-filter/dkimproxy/dkimproxy-1.2.ebuild b/mail-filter/dkimproxy/dkimproxy-1.2.ebuild
index b6da1b4..9795eba 100644
--- a/mail-filter/dkimproxy/dkimproxy-1.2.ebuild
+++ b/mail-filter/dkimproxy/dkimproxy-1.2.ebuild
@@ -21,29 +21,26 @@ RDEPEND="dev-perl/Mail-DKIM
 "
 DEPEND="${RDEPEND}"
 
-src_configure() {
-	econf \
-		--sysconfdir=/etc/${PN}
-}
-
 src_install() {
 	base_src_install
 
 	dodoc AUTHORS README || die
-	newinitd ${FILESDIR}/dkimproxy.out-initd dkimproxy.out || die
-	newinitd ${FILESDIR}/dkimproxy.in-initd dkimproxy.in || die
-
-	insinto /etc/${PN}
-	newins ${FILESDIR}/dkimproxy_in.conf.gentoo dkimproxy_in.conf.example || die
-	newins ${FILESDIR}/dkimproxy_out.conf.gentoo dkimproxy_out.conf.example || die
+	newinitd "${FILESDIR}/dkimproxy.out-initd" dkimproxy.out || die
+	newinitd "${FILESDIR}/dkimproxy.in-initd" dkimproxy.in || die
+
+	rm -f "${D}/etc/dkimproxy_in.conf.example" || die
+	rm -f "${D}/etc/dkimproxy_out.conf.example" || die
+	insinto /etc
+	newins "${FILESDIR}/dkimproxy_in.conf.gentoo" dkimproxy_in.conf || die
+	newins "${FILESDIR}/dkimproxy_out.conf.gentoo" dkimproxy_out.conf || die
+ 	keepdir /etc/ssl/${PN}
 }
 
 pkg_postinst() {
-	CONFDIR=/etc/${PN}/
-	if [[ ! -f ${CONFDIR}/sample.private.key ]]; then
-		openssl genrsa -out ${CONFDIR}/sample.private.key 1024 &>/dev/null
-		openssl rsa -in ${CONFDIR}/sample.private.key -out ${CONFDIR}/sample.public.key -pubout -outform PEM
+	CONFDIR="/etc/ssl/${PN}/"
+	if [[ ! -f "${CONFDIR}/dkimproxy.private.key" ]]; then
+		openssl genrsa -out "${CONFDIR}/dkimproxy.private.key" 1024 &>/dev/null || die
+		openssl rsa -in "${CONFDIR}/dkimproxy.private.key" -out "${CONFDIR}/dkimproxy.public.key" -pubout -outform PEM || die
 		elog "Autogenerated sample signing keys in ${CONFDIR}."
 	fi
-	ewarn "You should edit your config files in ${CONFDIR} before starting ${PN} !"
 }
diff --git a/mail-filter/dkimproxy/files/dkimproxy.in-initd b/mail-filter/dkimproxy/files/dkimproxy.in-initd
index 47ae522..f948ef4 100644
--- a/mail-filter/dkimproxy/files/dkimproxy.in-initd
+++ b/mail-filter/dkimproxy/files/dkimproxy.in-initd
@@ -4,7 +4,7 @@
 # $Header: $
 
 PIDFILE=/var/run/dkimproxy_in.pid
-CONFIGFILE=/etc/dkimproxy/dkimproxy_in.conf
+CONFIGFILE=/etc/dkimproxy_in.conf
 
 depend() {
 	need net
diff --git a/mail-filter/dkimproxy/files/dkimproxy.out-initd b/mail-filter/dkimproxy/files/dkimproxy.out-initd
index 4701fef..65ba6b8 100644
--- a/mail-filter/dkimproxy/files/dkimproxy.out-initd
+++ b/mail-filter/dkimproxy/files/dkimproxy.out-initd
@@ -4,7 +4,7 @@
 # $Header: $
 
 PIDFILE=/var/run/dkimproxy_out.pid
-CONFIGFILE=/etc/dkimproxy/dkimproxy_out.conf
+CONFIGFILE=/etc/dkimproxy_out.conf
 
 depend() {
 	need net
diff --git a/mail-filter/dkimproxy/files/dkimproxy_out.conf.gentoo b/mail-filter/dkimproxy/files/dkimproxy_out.conf.gentoo
index 6f14175..f780bd5 100644
--- a/mail-filter/dkimproxy/files/dkimproxy_out.conf.gentoo
+++ b/mail-filter/dkimproxy/files/dkimproxy_out.conf.gentoo
@@ -12,7 +12,7 @@ signature dkim(c=relaxed)
 signature domainkeys(c=nofws)
 
 # specify location of the private key
-keyfile   /etc/dkimproxy/sample.private.key
+keyfile   /etc/ssl/dkimproxy/dkimproxy.private.key
 
 # specify the selector (i.e. the name of the key record put in DNS)
 selector  selector1