Gentoo Archives: gentoo-commits

From: "Tiziano Müller" <dev-zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/
Date: Sun, 31 Jul 2011 13:48:21
Message-Id: b02518b9327b399c18fa56ff309b73a46e5d16a0.dev-zero@gentoo
1 commit: b02518b9327b399c18fa56ff309b73a46e5d16a0
2 Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 31 13:46:25 2011 +0000
4 Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 31 13:46:25 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=b02518b9
7
8 follow naming convention of other variables
9
10 ---
11 www-servers/uwsgi/Manifest | 4 ++--
12 www-servers/uwsgi/files/uwsgi.confd | 4 ++++
13 www-servers/uwsgi/files/uwsgi.initd | 4 ++--
14 3 files changed, 8 insertions(+), 4 deletions(-)
15
16 diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
17 index ce87e07..413f93c 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 1124 RMD160 74ee67f07a8f68c73ad3ca92859902743a7d54df SHA1 af8e198008a363071476af23dba9d9fdcb6abe44 SHA256 6da06c6407a1919621d4134b41d95205f585197828e5e0e2bccd475787fce0a7
25 -AUX uwsgi.initd 2256 RMD160 b649df65c3e0d3276306fb02ef7640ce6848a2eb SHA1 c915948f1af3b60998b7ff65443ebc90bc372b00 SHA256 e36f6f7979e2961402b0a7c51b62f89c48126e1228d1b45db15cb51bbc9f754e
26 +AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094ce9cf3b55f1c418f1602e0451462103a5117174a4
27 +AUX uwsgi.initd 2258 RMD160 567652a6d348494e8f74c002a4af48c361fe4202 SHA1 7119489ea985984735fc11e9f1414cc737d3c09e SHA256 38df43560b1a4de0bef8b3455bec46942917c97465da9ab167a4fc33ab1d53f8
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 2c04ca2..e08f688 100644
34 --- a/www-servers/uwsgi/files/uwsgi.confd
35 +++ b/www-servers/uwsgi/files/uwsgi.confd
36 @@ -42,6 +42,10 @@
37 #
38 #UWSGI_USER=
39
40 +# Run the uwsgi emperor which loads vassals dynamically
41 +# see http://projects.unbit.it/uwsgi/wiki/Emperor
42 +#UWSGI_EMPEROR=
43 +
44 # Additional options you might want to pass to uWSGI
45 #
46 #UWSGI_EXTRA_OPTIONS=
47
48 diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
49 index 64fb91b..580f967 100644
50 --- a/www-servers/uwsgi/files/uwsgi.initd
51 +++ b/www-servers/uwsgi/files/uwsgi.initd
52 @@ -69,8 +69,8 @@ start() {
53 OPTIONS="${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}"
54 fi
55
56 - if [ -n "${EMPEROR_PATH}" ] ; then
57 - OPTIONS="${OPTIONS} --emperor \"${EMPEROR_PATH}\""
58 + if [ -n "${UWSGI_EMPEROR}" ] ; then
59 + OPTIONS="${OPTIONS} --emperor \"${UWSGI_EMPEROR}\""
60 else
61 OPTIONS="${OPTIONS} --master"
62 fi