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 14:02:55
Message-Id: 60c252e51d04a4fb204a4baa31824d99a9aa0f6f.dev-zero@gentoo
1 commit: 60c252e51d04a4fb204a4baa31824d99a9aa0f6f
2 Author: Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 31 13:21:38 2011 +0000
4 Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 31 13:21:38 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=60c252e5
7
8 make the init.d-script useable, let it create /var/run/uwsgi
9
10 ---
11 www-servers/uwsgi/Manifest | 4 ++--
12 www-servers/uwsgi/files/uwsgi.initd | 23 ++---------------------
13 www-servers/uwsgi/uwsgi-0.9.8.3.ebuild | 1 -
14 3 files changed, 4 insertions(+), 24 deletions(-)
15
16 diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
17 index e44697a..813744a 100644
18 --- a/www-servers/uwsgi/Manifest
19 +++ b/www-servers/uwsgi/Manifest
20 @@ -2,7 +2,7 @@ MISC ChangeLog 533 RMD160 cef38aefe63bc7d5ad4a767bc34b7f57a1be9b5a SHA1 80e5cd4b
21 AUX 42_mod_uwsgi.conf 159 RMD160 d3de5b69a9e292c731508b13a0bdbe234fac9db7 SHA1 24624a805c16778aaa4e24b74d2e8230ee381aec SHA256 b759712baa7b8abab2ffd56c3cbc970cb9189ef1efa3f3aa154a963dc67ba861
22 AUX uwsgi-0.9.8-no-werror.patch 624 RMD160 ef3ebbfff1c6b4a49297e780b5eb5545786f8173 SHA1 a4e0923cb5ebaab19cee5b4495b1625f54c7510b SHA256 8650fe560d25d9b6facf8034bb5edfedc8aa74f22a716da702d2b97a1d298998
23 AUX uwsgi.confd 1116 RMD160 e13ddecb06cf4efaf75216ec657db99a4abbbddf SHA1 9df38c84bc2d612803629a6a2e6bd9a3a5568d33 SHA256 3c238b934f8db9eae87f77dc3d131499e442526d5e45438b5461c0d7590b772f
24 -AUX uwsgi.initd 2705 RMD160 96ee8102823eddfcfc17da14882aed17c7ca5249 SHA1 35365c5ca755cd650424c826488ac85b067e4575 SHA256 328087fe8a36e91155c1173cfddc257f4479b1588bc56689b42a0fc74707bed4
25 +AUX uwsgi.initd 2109 RMD160 47777360891b810eb53a15f15bece33958692d37 SHA1 f22692601568597b261ddcdc5ee9def525bc19e8 SHA256 cda6ffcff61184b3d50beb8c58d2aa62f56aad552660feb6df5dd84d8e4f758a
26 MISC metadata.xml 255 RMD160 07d553bdf9282f61c4e99ad3f7697a310946cf9d SHA1 533ddafc8a18d2110ccdbec4c99c48abbcd6e633 SHA256 e3eef1b3ebe3eea3ba74657f3a332c7427c1bd24a5609d2ff887f63901d9cd35
27 -EBUILD uwsgi-0.9.8.3.ebuild 1870 RMD160 53ae8621ac13e000fc29e1ab6e37fcfab87f8434 SHA1 a1a3ad0e9cd8db43aae9f07ee2077b3c3e9cab56 SHA256 08a663229cd0510fa3eb4ccc16aa68343b7097f7436c7c37e4f6880b4b00c698
28 +EBUILD uwsgi-0.9.8.3.ebuild 1841 RMD160 efc9d251734d8c15a1108a654f49304def8e9009 SHA1 db42a0a23a42b4cbd1110ae3e2da9a6b72e86645 SHA256 d15343367daa297e17f81265afc19b73e793c26582d7b2cd10ff839b4c694d15
29 DIST uwsgi-0.9.8.3.tar.gz 351168 RMD160 8bfdaa9a503516378e834bca60dfa828b7bee9d2 SHA1 780a96a2c32a0f7bb7f5a63353acca2fbd23a8e6 SHA256 2b529a8408bb4938ebccd3c4264af5af4f17ee5bd6043376ef3909c2411f611f
30
31 diff --git a/www-servers/uwsgi/files/uwsgi.initd b/www-servers/uwsgi/files/uwsgi.initd
32 index 3fedecc..ec8dd46 100644
33 --- a/www-servers/uwsgi/files/uwsgi.initd
34 +++ b/www-servers/uwsgi/files/uwsgi.initd
35 @@ -14,6 +14,8 @@ depend() {
36 }
37
38 start() {
39 + mkdir "/var/run/uwsgi"
40 +
41 local OPTIONS
42
43 if [ "${SVCNAME}" = "uwsgi" ]; then
44 @@ -28,27 +30,6 @@ start() {
45 return 1
46 fi
47
48 - if [ -z "${UWSGI_SOCKET}" ]; then
49 - eerror "You need to specify path (or name) of UNIX/TCP socket to bind to"
50 - eerror "in UWSGI_SOCKET"
51 - return 1
52 - fi
53 -
54 - if [ -z "${UWSGI_PROGRAM}" ] && [ -z "${UWSGI_XML_CONFIG}" ]; then
55 - eerror "You need to specify which \$UWSGI_PROGRAM or \$UWSGI_XML_CONFIG"
56 - eerror "you want to start."
57 - eerror "Please adjust /etc/conf.d/uwsgi.${PROGNAME}"
58 - return 1
59 - fi
60 -
61 - if [ -n "${UWSGI_PROGRAM}" ] && [ -n "${UWSGI_XML_CONFIG}" ]; then
62 - eerror "Only one of the two may be defined:"
63 - eerror " UWSGI_PROGRAM=${UWSGI_PROGRAM}"
64 - eerror " UWSGI_XML_CONFIG=${UWSGI_XML_CONFIG}"
65 - return 1
66 - fi
67 -
68 -
69 OPTIONS="--master --daemonize"
70
71 if [ -n "$UWSGI_LOG_FILE" ]; then
72
73 diff --git a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
74 index 10c82a8..c5b45f5 100644
75 --- a/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
76 +++ b/www-servers/uwsgi/uwsgi-0.9.8.3.ebuild
77 @@ -57,7 +57,6 @@ src_install() {
78
79 newinitd "${FILESDIR}"/uwsgi.initd uwsgi
80 newconfd "${FILESDIR}"/uwsgi.confd uwsgi
81 - mkdir "${ED}"/var/run/uwsgi
82 }
83
84 pkg_postinst() {