Abstracted the socket activation unit files to use any port for one or both SMTP and HTTP and updated instructions as printed during installation.

5 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03f0890186ea..455a20b216f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Apr  6 16:26:33 UTC 2016
+# Wed Apr  6 16:37:55 UTC 2016
 pkgbase = ruby-mailcatcher
 	pkgdesc = Catches mail and serves it through a dream.
 	pkgver = 0.6.1
-	pkgrel = 10
+	pkgrel = 11
 	url = http://mailcatcher.me
 	install = ruby-mailcatcher.install
 	arch = any
@@ -23,15 +23,15 @@ pkgbase = ruby-mailcatcher
 	options = !emptydirs
 	source = http://gems.rubyforge.org/gems/mailcatcher-0.6.1.gem
 	source = mailcatcher.service
-	source = mailcatcher-http.socket
+	source = mailcatcher-http@.socket
 	source = mailcatcher-http.service
-	source = mailcatcher-smtp.socket
+	source = mailcatcher-smtp@.socket
 	source = mailcatcher-smtp.service
 	md5sums = bdeb5656e0931d1b211b52aa0f9e31f5
 	md5sums = c6e70c3b5b061fb3e13ad56fea757b01
-	md5sums = e72d4a12219e7f0d52fa6095738ed9d5
+	md5sums = 5058d837ddef08507197a1cb17dcab34
 	md5sums = a3be575ff001fedc044ba43e6fdd31f7
-	md5sums = d0002eca814fbef980a058303a277634
+	md5sums = 354d0e3422ef2f890ad5c598c709372b
 	md5sums = be35bfe4c621b7f2ff733e2c21bee54d
 
 pkgname = ruby-mailcatcher
diff --git a/PKGBUILD b/PKGBUILD
index 3bd157a8c07f..8b5ceaaa92cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=mailcatcher
 pkgname=ruby-$_pkgname
 pkgver=0.6.1
-pkgrel=10
+pkgrel=11
 pkgdesc='Catches mail and serves it through a dream.'
 arch=('any')
 url="http://$_pkgname.me"
@@ -18,16 +18,16 @@ install="$pkgname.install"
 source=(
   "http://gems.rubyforge.org/gems/$_pkgname-$pkgver.gem"
   "$_pkgname.service"
-  "$_pkgname-http.socket"
+  "$_pkgname-http@.socket"
   "$_pkgname-http.service"
-  "$_pkgname-smtp.socket"
+  "$_pkgname-smtp@.socket"
   "$_pkgname-smtp.service"
 )
 md5sums=('bdeb5656e0931d1b211b52aa0f9e31f5'
          'c6e70c3b5b061fb3e13ad56fea757b01'
-         'e72d4a12219e7f0d52fa6095738ed9d5'
+         '5058d837ddef08507197a1cb17dcab34'
          'a3be575ff001fedc044ba43e6fdd31f7'
-         'd0002eca814fbef980a058303a277634'
+         '354d0e3422ef2f890ad5c598c709372b'
          'be35bfe4c621b7f2ff733e2c21bee54d')
 noextract=("$_pkgname-$pkgver.gem")
 
@@ -45,7 +45,7 @@ package() {
   sed -i '/dependency(%q<thin>/{s/".*"/"~> 1"/}' $_gemspec
 
   # Install systemd units
-  for file in "$_pkgname"{.service,{-http,-smtp}{.service,.socket}}; do
+  for file in "$_pkgname"{.service,{-http,-smtp}{.service,@.socket}}; do
     install -Dm644 "$file" "$pkgdir/usr/lib/systemd/system/$file"
   done
 }
diff --git a/mailcatcher-http.socket b/mailcatcher-http@.socket
index f33eb136c2e6..99024e95d94b 100644
--- a/mailcatcher-http.socket
+++ b/mailcatcher-http@.socket
@@ -3,7 +3,8 @@ Description=Mailcatcher HTTP Activation Socket
 After=network.target
 
 [Socket]
-ListenStream=80
+ListenStream=%I
+Service=mailcatcher-http.service
 
 [Install]
 WantedBy=sockets.target
diff --git a/mailcatcher-smtp.socket b/mailcatcher-smtp@.socket
index b92f667a2cf2..b2b7e28f866f 100644
--- a/mailcatcher-smtp.socket
+++ b/mailcatcher-smtp@.socket
@@ -3,7 +3,8 @@ Description=Mailcatcher SMTP Activation Socket
 After=network.target
 
 [Socket]
-ListenStream=25
+ListenStream=%I
+Service=mailcatcher-smtp.service
 
 [Install]
 WantedBy=sockets.target
diff --git a/ruby-mailcatcher.install b/ruby-mailcatcher.install
index 03c367fbb950..aabd97d8a879 100644
--- a/ruby-mailcatcher.install
+++ b/ruby-mailcatcher.install
@@ -1,10 +1,10 @@
 post_install() {
-  echo ">>> Start mail catcher at boot by enabling the systemd service unit, mailcatcher.service. (The default SMTP and HTTP ports are 1025 and 1080, respectively.)"
-  echo ">>> Map port 25 (HTTP) and/or port 80 (SMTP) to mail catcher via socket actviation by using mailcatcher-smtp.socket and mailcatcher-http.socket."
+  echo ">>> Start mailcatcher using the mailcatcher.service unit file. (The default SMTP and HTTP ports are 1025 and 1080, respectively.)"
+  echo ">>> Or, socket-activate mailcatcher with another port for either or both using: mailcatcher-smtp@.socket or mailcatcher-http@.socket."
 }
 
 pre_remove() {
-  for unit in mailcatcher{.service,-{http,smtp}.{service,socket}}; do
+  for unit in mailcatcher{.service,-{http,smtp}{.service,@.socket}}; do
     systemctl --quiet is-active $unit && systemctl stop $unit
     systemctl --quiet is-enabled $unit && systemctl disable $unit
   done