diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2015-03-13 07:02:07 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2015-03-13 07:02:07 +0000 |
| commit | f29e85113022b7c4fee1190015124c4cb48635af (patch) | |
| tree | 210a06423472ca4bc905e485be2b9bf5ba3f9b18 | |
| parent | c7d20a860e11877356eff8f907f02fd948302e67 (diff) | |
| download | aports-f29e85113022b7c4fee1190015124c4cb48635af.tar.bz2 aports-f29e85113022b7c4fee1190015124c4cb48635af.tar.xz | |
Revert "testing/sniproxy: fixed init and added confd"
This reverts commit c7d20a860e11877356eff8f907f02fd948302e67.
| -rw-r--r-- | testing/sniproxy/APKBUILD | 16 | ||||
| -rw-r--r-- | testing/sniproxy/sniproxy.confd | 3 | ||||
| -rw-r--r-- | testing/sniproxy/sniproxy.initd | 34 |
3 files changed, 16 insertions, 37 deletions
diff --git a/testing/sniproxy/APKBUILD b/testing/sniproxy/APKBUILD index 4651a49028..11db51f722 100644 --- a/testing/sniproxy/APKBUILD +++ b/testing/sniproxy/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=sniproxy pkgver=0.3.6 -pkgrel=3 +pkgrel=2 pkgdesc="Proxies incoming HTTP and TLS connections based on the hostname contained in the initial request of the TCP session." url="https://github.com/dlundquist/sniproxy" @@ -16,8 +16,7 @@ makedepends="$depends_dev autoconf automake bsd-compat-headers gettext-dev install="${pkgname}.pre-install" subpackages="$pkgname-doc" source="https://github.com/dlundquist/$pkgname/archive/$pkgver.tar.gz - $pkgname.initd - $pkgname.confd" + $pkgname.initd" pkgusers="sniproxy" pkggroups="sniproxy" @@ -44,8 +43,6 @@ package() { make DESTDIR="$pkgdir" install || return 1 install -Dm755 "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname || return 1 - install -Dm644 "$srcdir"/$pkgname.confd \ - "$pkgdir"/etc/conf.d/$pkgname || return 1 for dir in /var/log /etc; do mkdir -p "$pkgdir"/$dir/$pkgname chown $pkgusers:$pkggroups "$pkgdir"/$dir/$pkgname @@ -53,11 +50,8 @@ package() { } md5sums="52a01eb55ac7712de2dd13f1ba6260e4 0.3.6.tar.gz -e3009c39715dc830ec9bb9f585a3f73a sniproxy.initd -6abadb70388f5bcf7ed2a17a2a683b39 sniproxy.confd" +7ce27ae791416c62dab08b2961b3a57c sniproxy.initd" sha256sums="90183ea5a380f1f946a9e0286334c916c2315bf005677ddc72f0afeed84a544c 0.3.6.tar.gz -91e5481b95f95e891c342b11d1dfd428161e48a307ca0bf22ca9fe39e6ff43f4 sniproxy.initd -caf702e26286e5fa1d10f9605538a17a4f81312b34898e4466539943ccae21ee sniproxy.confd" +6eac747753ddb798ba3c9970a1e165c6a523bff3bc90f3c078eab066470a0f6d sniproxy.initd" sha512sums="5d2a3b181c3a710a5443c21d3c6181354e473c134e99a258b4d10dc452d449507d057ef65ad0586ecc43800b271fc03635f3d27a043855846248ca14e807781c 0.3.6.tar.gz -ebec6d3024ff1f536102fcae6e22c57e6d90723cc954327cb35f27e6eb8f0521dadc1e906219d416a33b0e5f59ed96b231820a63349585ebec480dfde6b85852 sniproxy.initd -f5399a0445ab7717794ff4cfd27c55f934e7b3246add9a44611be392bd6ae68eaf769ccc1892e8a878c65b1e1d7d7b2f8798c3318e811a156652131e4d2fa942 sniproxy.confd" +6dea98a5428b97a1def6d0fa0b08386a8b2dfccf6d53a1d3eafb78352aac6caede72eece23c883a048876731c247abfda51e5a9e00ed628c5f1b2ce846d1e74a sniproxy.initd" diff --git a/testing/sniproxy/sniproxy.confd b/testing/sniproxy/sniproxy.confd deleted file mode 100644 index 65f7111a23..0000000000 --- a/testing/sniproxy/sniproxy.confd +++ /dev/null @@ -1,3 +0,0 @@ -CMD="/usr/sbin/sniproxy" -PIDFILE="/var/run/sniproxy.pid" -CONF="/etc/sniproxy/sniproxy.conf" diff --git a/testing/sniproxy/sniproxy.initd b/testing/sniproxy/sniproxy.initd index 92ee88e95d..daa326b821 100644 --- a/testing/sniproxy/sniproxy.initd +++ b/testing/sniproxy/sniproxy.initd @@ -1,31 +1,19 @@ #!/sbin/runscript -depend() { - need net - after firewall -} +pidfile="/var/run/${SVCNAME}.pid" +command="/usr/sbin/${SVCNAME}" +: ${conf_file:="/etc/sniproxy/sniproxy.conf"} -checkconfig() { - if [ ! -e "${CONF}" ] ; then - eerror "You need a ${CONF} file to run sniproxy" - return 1 - fi +depend() { + need net + after firewall } start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start \ - --exec "${CMD}" --pidfile "${PIDFILE}" \ - -- -c "${CONF}" - eend $? -} - -stop() { - checkconfig || return 1 - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec "${CMD}" \ - --pidfile "${PIDFILE}" --quiet - eend $? + ebegin "Starting $SVCNAME" + start-stop-daemon --start \ + --quiet --pidfile $pidfile --exec $command \ + -- -c "$conf_file" "$@" + eend } |