summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Simons2015-09-15 10:35:49 +0200
committerDave Simons2015-09-15 10:35:49 +0200
commit92be26df72256dcae82219d3d87a48cb83d09939 (patch)
tree55ab1e1c476a53e21e07527d288f4ebe08fedcc2
parent1f26062b940ad863a9627598a764f9a0c08e85b1 (diff)
downloadaur-92be26df72256dcae82219d3d87a48cb83d09939.tar.gz
fix unit file
Signed-off-by: Dave Simons <pkgs@simonsd.org>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--sshttpd.service9
3 files changed, 9 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2fb5f51816f8..9337eedb1d26 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sshttp-git
pkgdesc = SSH/HTTP(S) multiplexer
pkgver = e145de8
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/stealth/sshttp
arch = any
license = BSD
@@ -19,7 +19,7 @@ pkgbase = sshttp-git
md5sums = SKIP
md5sums = 22d5c47059ba77d09812106800939d57
md5sums = 6d35b4409cac3ebd6e75f4736805f102
- md5sums = cff8825c1428b87836218af0ed8a0066
+ md5sums = 5f81b44894a53c19b3ce47108902d703
pkgname = sshttp-git
diff --git a/PKGBUILD b/PKGBUILD
index 9af7d41b6653..972ac6c7e47f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=sshttp-git
pkgver=e145de8
-pkgrel=4
+pkgrel=5
pkgdesc="SSH/HTTP(S) multiplexer"
arch=('any')
url="https://github.com/stealth/sshttp"
@@ -19,7 +19,7 @@ source=('git://github.com/stealth/sshttp'
md5sums=('SKIP'
'22d5c47059ba77d09812106800939d57'
'6d35b4409cac3ebd6e75f4736805f102'
- 'cff8825c1428b87836218af0ed8a0066')
+ '5f81b44894a53c19b3ce47108902d703')
pkgver() {
cd $srcdir/${pkgname%-git}
diff --git a/sshttpd.service b/sshttpd.service
index 876f5be6ce88..fa7954f01848 100644
--- a/sshttpd.service
+++ b/sshttpd.service
@@ -7,10 +7,11 @@ Type=oneshot
User=root
Group=root
EnvironmentFile=/etc/conf.d/sshttpd
-ExecStart=/usr/bin/nf-setup ; \
- /usr/bin/sshttpd -S $SSH_PORT -H $HTTP_PORT -L $LISTEN_PORT -l $LISTEN_ADDRESS -U $USER -R $CHROOT_DIR
-ExecStop=/usr/bin/nf-cleanup ; \
- /usr/bin/killall sshttpd
+ExecStartPre=/usr/bin/nf-setup
+ExecStart=/usr/bin/sshttpd -S $SSH_PORT -H $HTTP_PORT -L $LISTEN_PORT -l $LISTEN_ADDRESS -U $USER -R $CHROOT_DIR
+ExecStop=/usr/bin/nf-cleanup
+ExecStopPost=/usr/bin/killall sshttpd
+RemainAfterExit=yes
[Install]
WantedBy=multi-user.target