aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Jirutka <jakub@jirutka.cz>2017-07-14 00:32:21 +0200
committerJakub Jirutka <jakub@jirutka.cz>2017-07-14 00:34:34 +0200
commitdac587046be9355d6b2954a0d9927215697ea95f (patch)
tree94b76db426435f663a6b20a562f237c1ab2e16ec
parentc842556ce90b1bce2dec2f10c7807b146e10048b (diff)
downloadaports-dac587046be9355d6b2954a0d9927215697ea95f.tar.bz2
aports-dac587046be9355d6b2954a0d9927215697ea95f.tar.xz
community/py-waitress: rename few variables in runscript
-rw-r--r--community/py-waitress/APKBUILD4
-rw-r--r--community/py-waitress/waitress.confd2
-rw-r--r--community/py-waitress/waitress.initd5
3 files changed, 6 insertions, 5 deletions
diff --git a/community/py-waitress/APKBUILD b/community/py-waitress/APKBUILD
index ab802fbcb2..c0fea4abfc 100644
--- a/community/py-waitress/APKBUILD
+++ b/community/py-waitress/APKBUILD
@@ -65,5 +65,5 @@ _py() {
}
sha512sums="b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0 waitress-1.0.2.tar.gz
-91a1e0470f7a74e9d006c8c69490adc87a9dd180f494a870da5a3d1332435993e3c3c56de9f0320d63d0f997f62960739ed130f52c654accd263118aa47a45bf waitress.initd
-93d3abe2226a396c60435875d3fefbdc0eaff2b5e6d7e98d33944f9b8167bf965ae20bb967407de668726cef2ab824b5a11e8c8b7babbc94ba0e451f07f6a178 waitress.confd"
+92c2e718e3aa3e4f5980208f482b9b0f0b3a3b6e736566635367ecaaecd86cfd98ba064c0b3d0bd33bab1acccfaf5a56557c7a162dbb86a166f277ffb2638a5c waitress.initd
+cceddb312049a1ae6141df403ee92e1276a4697a23ef8063b47721f59c508a4ded604802c6f55face5620e7be06e893ef51309ee7d8058d81858f86b2fc94cbe waitress.confd"
diff --git a/community/py-waitress/waitress.confd b/community/py-waitress/waitress.confd
index 0c94736f15..7d0f62609d 100644
--- a/community/py-waitress/waitress.confd
+++ b/community/py-waitress/waitress.confd
@@ -52,7 +52,7 @@ listen_on="*:8080"
# Extra options for waitress-serve.
# See https://docs.pylonsproject.org/projects/waitress/en/latest/runner.html.
-#extra_opts=
+#waitress_opts=
# Note: If you need to pass some environment variables to the application, set
# start_stop_daemon_args="--env FOO=bar --env BAZ=qux"
diff --git a/community/py-waitress/waitress.initd b/community/py-waitress/waitress.initd
index ce7984756d..79e3aa5d3d 100644
--- a/community/py-waitress/waitress.initd
+++ b/community/py-waitress/waitress.initd
@@ -2,12 +2,13 @@
: ${user:="nobody"}
: ${python:="/usr/bin/python3"}
+: ${python_opts:="-u"} # this is needed for stdout/stderr redirect to work
: ${wsgi_module:=}
: ${wsgi_object:="application"}
: ${wsgi_call:="no"}
command="$python"
-command_args="-u ${command_args:-} /usr/bin/waitress-serve"
+command_args="$python_opts /usr/bin/waitress-serve"
command_background="yes"
pidfile="/run/$RC_SVCNAME.pid"
@@ -64,7 +65,7 @@ start_pre() {
$(optif --url-scheme "$url_scheme")
$(optif --url-prefix "$url_prefix")
$(optif --ident "$server_ident")
- ${extra_opts:-}
+ ${waitress_opts:-}
$wsgi_module:$wsgi_object"
command_args="$command_args $waitress_args"