Updated systemd support in the ruby-mailcatcher package with pre-configured unit files that can enabled and started as-is.

7 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d349cf7800a..4de3db4ffb09 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,11 +26,11 @@ pkgbase = ruby-mailcatcher
 	source = mailcatcher-smtp.socket
 	source = mailcatcher-smtp@.service
 	md5sums = bdeb5656e0931d1b211b52aa0f9e31f5
-	md5sums = 877e07e9d8a2ddea3dd1d27644e77565
-	md5sums = 26f37032d32b33b02388778d1d41601f
-	md5sums = 2b9e475d3ba8d144b5fbf6f32162e3ac
-	md5sums = 5d19076f812ba58be414955a7880d9d2
-	md5sums = 0f7f88dd6c36fa69ea6635f27aa7d29b
+	md5sums = cf357f9859b6f24210d07ccce7313879
+	md5sums = d21981c2877a578555bcd61c0c6bc718
+	md5sums = a8a07564d971bc1df3cc786cda27c333
+	md5sums = 2c1d5788aff53e89600f037b523cab69
+	md5sums = 8e57104285979856653f99e5564b613d
 
 pkgname = ruby-mailcatcher
 
diff --git a/PKGBUILD b/PKGBUILD
index 7865ae1135b0..4489ab2a8741 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,11 +24,11 @@ source=(
   "$_pkgname-smtp@.service"
 )
 md5sums=('bdeb5656e0931d1b211b52aa0f9e31f5'
-         '877e07e9d8a2ddea3dd1d27644e77565'
-         '26f37032d32b33b02388778d1d41601f'
-         '2b9e475d3ba8d144b5fbf6f32162e3ac'
-         '5d19076f812ba58be414955a7880d9d2'
-         '0f7f88dd6c36fa69ea6635f27aa7d29b')
+         'cf357f9859b6f24210d07ccce7313879'
+         'd21981c2877a578555bcd61c0c6bc718'
+         'a8a07564d971bc1df3cc786cda27c333'
+         '2c1d5788aff53e89600f037b523cab69'
+         '8e57104285979856653f99e5564b613d')
 noextract=("$_pkgname-$pkgver.gem")
 
 package() {
diff --git a/mailcatcher-http.socket b/mailcatcher-http.socket
index b0cd81fc87f2..8cc6b0d14972 100644
--- a/mailcatcher-http.socket
+++ b/mailcatcher-http.socket
@@ -1,5 +1,7 @@
 [Unit]
 Description=Mailcatcher HTTP Activation Socket
+Requires=mailcatcher.service
+After=network.target mailcatcher.service
 
 [Socket]
 ListenStream=80
diff --git a/mailcatcher-http@.service b/mailcatcher-http@.service
index 21d4a7373021..818a83c2a6c3 100644
--- a/mailcatcher-http@.service
+++ b/mailcatcher-http@.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Mailcatcher HTTP Mapping Service
-Wants=mailcatcher.service
-After=network.target mailcatcher.service
 
 [Service]
 ExecStart=/usr/bin/nc localhost 1080
diff --git a/mailcatcher-smtp.socket b/mailcatcher-smtp.socket
index c96ca43056d7..1d14cee1d625 100644
--- a/mailcatcher-smtp.socket
+++ b/mailcatcher-smtp.socket
@@ -1,5 +1,7 @@
 [Unit]
 Description=Mailcatcher SMTP Activation Socket
+Requires=mailcatcher.service
+After=network.target mailcatcher.service
 
 [Socket]
 ListenStream=25
diff --git a/mailcatcher-smtp@.service b/mailcatcher-smtp@.service
index 2dd83126344f..a6fd1f914b7f 100644
--- a/mailcatcher-smtp@.service
+++ b/mailcatcher-smtp@.service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Mailcatcher SMTP Mapping Service
-Wants=mailcatcher.service
-After=network.target mailcatcher.service
 
 [Service]
 ExecStart=/usr/bin/nc localhost 1025
diff --git a/mailcatcher.service b/mailcatcher.service
index 1938f11dcbdd..82fe83701891 100644
--- a/mailcatcher.service
+++ b/mailcatcher.service
@@ -3,8 +3,8 @@ Description=Mailcatcher Service
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/mailcatcher --ip localhost --foreground --verbose
-KillSignal=SIGKILL
+ExecStart=/usr/bin/mailcatcher --ip localhost --http-port 1080 --smtp-port 1025 --foreground --verbose
+ExecStop=/usr/bin/curl --silent --get --request DELETE localhost:1080
 
 [Install]
 WantedBy=multi-user.target