From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QnWNR-0000IG-3p for garchives@archives.gentoo.org; Sun, 31 Jul 2011 13:48:21 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04E6B21C023; Sun, 31 Jul 2011 13:48:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B289E21C023 for ; Sun, 31 Jul 2011 13:48:11 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2ADFE1B4024 for ; Sun, 31 Jul 2011 13:48:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4C0C53C004 for ; Sun, 31 Jul 2011 13:48:10 +0000 (UTC) From: "Tiziano Müller" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tiziano Müller" Message-ID: Subject: [gentoo-commits] dev/dev-zero:master commit in: www-servers/uwsgi/files/, www-servers/uwsgi/ X-VCS-Repository: dev/dev-zero X-VCS-Files: www-servers/uwsgi/Manifest www-servers/uwsgi/files/uwsgi.confd www-servers/uwsgi/files/uwsgi.initd X-VCS-Directories: www-servers/uwsgi/files/ www-servers/uwsgi/ X-VCS-Committer: dev-zero X-VCS-Committer-Name: Tiziano Müller X-VCS-Revision: b02518b9327b399c18fa56ff309b73a46e5d16a0 Date: Sun, 31 Jul 2011 13:48:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 21b8a355205c4074e043cd41d79f8cd6 commit: b02518b9327b399c18fa56ff309b73a46e5d16a0 Author: Tiziano Mueller gentoo org> AuthorDate: Sun Jul 31 13:46:25 2011 +0000 Commit: Tiziano M=C3=BCller gentoo org> CommitDate: Sun Jul 31 13:46:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dev-zero.git;a= =3Dcommit;h=3Db02518b9 follow naming convention of other variables --- www-servers/uwsgi/Manifest | 4 ++-- www-servers/uwsgi/files/uwsgi.confd | 4 ++++ www-servers/uwsgi/files/uwsgi.initd | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest index ce87e07..413f93c 100644 --- a/www-servers/uwsgi/Manifest +++ b/www-servers/uwsgi/Manifest @@ -1,8 +1,8 @@ MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 = 80e5cd4bd06fa22b86e439e7260064260df14d37 SHA256 418abb3d30490aae32336efcb= 4c27ee96af8a09f1f9bbfc629384efe8c2363a9 AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db= 7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2= ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861 AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5= 545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe56= 0d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998 -AUX uwsgi.confd 1124 RMD160 74ee67f07a8f68c73ad3ca92859902743a7d54df SHA= 1 af8e198008a363071476af23dba9d9fdcb6abe44 SHA256 6da06c6407a1919621d4134= b41d95205f585197828e5e0e2bccd475787fce0a7 -AUX uwsgi.initd 2256 RMD160 b649df65c3e0d3276306fb02ef7640ce6848a2eb SHA= 1 c915948f1af3b60998b7ff65443ebc90bc372b00 SHA256 e36f6f7979e2961402b0a7c= 51b62f89c48126e1228d1b45db15cb51bbc9f754e +AUX uwsgi.confd 1247 RMD160 f3cbb0ed1e83385e917949b7df1b8953792b9464 SHA= 1 2cba8d1990f0138f7bea113fec924b1656d53a8c SHA256 26c52f22137ffd44ef4c094= ce9cf3b55f1c418f1602e0451462103a5117174a4 +AUX uwsgi.initd 2258 RMD160 567652a6d348494e8f74c002a4af48c361fe4202 SHA= 1 7119489ea985984735fc11e9f1414cc737d3c09e SHA256 38df43560b1a4de0bef8b34= 55bec46942917c97465da9ab167a4fc33ab1d53f8 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SH= A1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba7465= 7f3a332c7427c1bd24a5609d2ff887f63901d9cd35 EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304d= ef8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367da= a297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15 DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828= b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408b= b4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f diff --git a/www-servers/uwsgi/files/uwsgi.confd b/www-servers/uwsgi/file= s/uwsgi.confd index 2c04ca2..e08f688 100644 --- a/www-servers/uwsgi/files/uwsgi.confd +++ b/www-servers/uwsgi/files/uwsgi.confd @@ -42,6 +42,10 @@ # #UWSGI_USER=3D =20 +# Run the uwsgi emperor which loads vassals dynamically +# see http://projects.unbit.it/uwsgi/wiki/Emperor +#UWSGI_EMPEROR=3D + # Additional options you might want to pass to uWSGI # #UWSGI_EXTRA_OPTIONS=3D diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/file= s/uwsgi.initd index 64fb91b..580f967 100644 --- a/www-servers/uwsgi/files/uwsgi.initd +++ b/www-servers/uwsgi/files/uwsgi.initd @@ -69,8 +69,8 @@ start() { OPTIONS=3D"${OPTIONS} --xmlconfig ${UWSGI_XML_CONFIG}" fi =20 - if [ -n "${EMPEROR_PATH}" ] ; then - OPTIONS=3D"${OPTIONS} --emperor \"${EMPEROR_PATH}\"" + if [ -n "${UWSGI_EMPEROR}" ] ; then + OPTIONS=3D"${OPTIONS} --emperor \"${UWSGI_EMPEROR}\"" else OPTIONS=3D"${OPTIONS} --master" fi