| 1 |
commit: 76c2dc75284b2ba0733cac17673ca8a399e54301 |
| 2 |
Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 31 13:39:39 2011 +0000 |
| 4 |
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 31 13:39:39 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=76c2dc75 |
| 7 |
|
| 8 |
make the init.d script recognize the emperor mode |
| 9 |
|
| 10 |
--- |
| 11 |
www-servers/uwsgi/Manifest | 4 ++-- |
| 12 |
www-servers/uwsgi/files/uwsgi.confd | 16 ++++++++-------- |
| 13 |
www-servers/uwsgi/files/uwsgi.initd | 8 +++++++- |
| 14 |
3 files changed, 17 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest |
| 17 |
index 48a306b..ce87e07 100644 |
| 18 |
--- a/www-servers/uwsgi/Manifest |
| 19 |
+++ b/www-servers/uwsgi/Manifest |
| 20 |
@@ -1,8 +1,8 @@ |
| 21 |
MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb4c27ee96af8a09f1f9bbfc629384efe8c2363a9 |
| 22 |
AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861 |
| 23 |
AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998 |
| 24 |
-AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f |
| 25 |
-AUX uwsgi.initd 2112 RMD160 cb71ca5b5f27c5ee918e02c0dd562e6b79ec7543 SHA1 fbfc9c17941962d917ab549108581b2e9d016217 SHA256 635f30cc4a414cbb50c96a500432d2da35bfbb7ab715dce010783f0db7e2d9f0 |
| 26 |
+AUX uwsgi.confd 1124 RMD160 74ee67f07a8f68c73ad3ca92859902743a7d54df SHA1 af8e198008a363071476af23dba9d9fdcb6abe44 SHA256 6da06c6407a1919621d4134b41d95205f585197828e5e0e2bccd475787fce0a7 |
| 27 |
+AUX uwsgi.initd 2256 RMD160 b649df65c3e0d3276306fb02ef7640ce6848a2eb SHA1 c915948f1af3b60998b7ff65443ebc90bc372b00 SHA256 e36f6f7979e2961402b0a7c51b62f89c48126e1228d1b45db15cb51bbc9f754e |
| 28 |
MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35 |
| 29 |
EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304def8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367daa297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15 |
| 30 |
DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f |
| 31 |
|
| 32 |
diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/files/uwsgi.confd |
| 33 |
index 11152da..2c04ca2 100644 |
| 34 |
--- a/www-servers/uwsgi/files/uwsgi.confd |
| 35 |
+++ b/www-servers/uwsgi/files/uwsgi.confd |
| 36 |
@@ -5,32 +5,32 @@ |
| 37 |
|
| 38 |
# Path (or name) of UNIX/TCP socket to bind to |
| 39 |
# |
| 40 |
-UWSGI_SOCKET=127.0.0.1:1234 |
| 41 |
+#UWSGI_SOCKET=127.0.0.1:1234 |
| 42 |
|
| 43 |
# Enable threads? |
| 44 |
# |
| 45 |
-UWSGI_THREADS=1 |
| 46 |
+#UWSGI_THREADS=1 |
| 47 |
|
| 48 |
# The path to your uWSGI application. |
| 49 |
# |
| 50 |
-UWSGI_PROGRAM= |
| 51 |
+#UWSGI_PROGRAM= |
| 52 |
|
| 53 |
# The path to your uWSGI xml config file. |
| 54 |
# |
| 55 |
-UWSGI_XML_CONFIG= |
| 56 |
+#UWSGI_XML_CONFIG= |
| 57 |
|
| 58 |
# The number of child processes to spawn. The default is 1. |
| 59 |
# |
| 60 |
-UWSGI_CHILDREN=1 |
| 61 |
+#UWSGI_CHILDREN=1 |
| 62 |
|
| 63 |
# The log file path. If empty logging is disabled |
| 64 |
# |
| 65 |
-UWSGI_LOG_FILE= |
| 66 |
+#UWSGI_LOG_FILE= |
| 67 |
|
| 68 |
# If you want to run your application inside a chroot then specify the |
| 69 |
# directory here. Leave this blank otherwise. |
| 70 |
# |
| 71 |
-UWSGI_CHROOT= |
| 72 |
+#UWSGI_CHROOT= |
| 73 |
|
| 74 |
# If you want to run your application from a specific directiory specify |
| 75 |
# it here. Leave this blank otherwise. |
| 76 |
@@ -40,7 +40,7 @@ UWSGI_CHROOT= |
| 77 |
# The user and group to run your application as. If you do not specify these, |
| 78 |
# the application will be run as root:root. |
| 79 |
# |
| 80 |
-UWSGI_USER= |
| 81 |
+#UWSGI_USER= |
| 82 |
|
| 83 |
# Additional options you might want to pass to uWSGI |
| 84 |
# |
| 85 |
|
| 86 |
diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd |
| 87 |
index aced947..64fb91b 100644 |
| 88 |
--- a/www-servers/uwsgi/files/uwsgi.initd |
| 89 |
+++ b/www-servers/uwsgi/files/uwsgi.initd |
| 90 |
@@ -30,7 +30,7 @@ start() { |
| 91 |
return 1 |
| 92 |
fi |
| 93 |
|
| 94 |
- OPTIONS="--master --daemonize" |
| 95 |
+ OPTIONS="--daemonize" |
| 96 |
|
| 97 |
if [ -n "$UWSGI_LOG_FILE" ]; then |
| 98 |
OPTIONS="${OPTIONS} $UWSGI_LOG_FILE" |
| 99 |
@@ -69,6 +69,12 @@ start() { |
| 100 |
OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}" |
| 101 |
fi |
| 102 |
|
| 103 |
+ if [ -n "${EMPEROR_PATH}" ] ; then |
| 104 |
+ OPTIONS="${OPTIONS} --emperor \"${EMPEROR_PATH}\"" |
| 105 |
+ else |
| 106 |
+ OPTIONS="${OPTIONS} --master" |
| 107 |
+ fi |
| 108 |
+ |
| 109 |
ebegin "Starting uWSGI application ${PROGNAME}" |
| 110 |
cd "${UWSGI_DIR}" && \ |
| 111 |
start-stop-daemon --start --user "${UWSGI_USER}" --exec "${UWSGI_EXEC}" -- ${OPTIONS} --pidfile "${PIDFILE}" |
Archives