Gentoo Archives: gentoo-commits

From: Devan Franchini <twitch153@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/webapp-config:master commit in: config/, WebappConfig/
Date: Thu, 22 Jun 2017 23:04:57
Message-Id: 1483954314.b68584681207baa80012345d2800764b1b338dfb.twitch153@gentoo
1 commit: b68584681207baa80012345d2800764b1b338dfb
2 Author: Vladimir Pavljuchenkov (SpiderX) <spiderx <AT> spiderx <DOT> dp <DOT> ua>
3 AuthorDate: Mon Jan 9 09:31:54 2017 +0000
4 Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 9 09:31:54 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=b6858468
7
8 Adds uWSGI server support
9
10 WebappConfig/config.py | 3 ++-
11 WebappConfig/server.py | 13 ++++++++++++-
12 config/webapp-config | 1 +
13 3 files changed, 15 insertions(+), 2 deletions(-)
14
15 diff --git a/WebappConfig/config.py b/WebappConfig/config.py
16 index 3a176a0..c66d146 100644
17 --- a/WebappConfig/config.py
18 +++ b/WebappConfig/config.py
19 @@ -1581,7 +1581,8 @@ class Config:
20 'cherokee' : WebappConfig.server.Cherokee,
21 'nginx' : WebappConfig.server.Nginx,
22 'gatling' : WebappConfig.server.Gatling,
23 - 'tracd' : WebappConfig.server.Tracd,}
24 + 'tracd' : WebappConfig.server.Tracd,
25 + 'uwsgi' : WebappConfig.server.uWSGI,}
26
27
28 server = self.config.get('USER', 'vhost_server')
29
30 diff --git a/WebappConfig/server.py b/WebappConfig/server.py
31 index ec9c141..a458505 100644
32 --- a/WebappConfig/server.py
33 +++ b/WebappConfig/server.py
34 @@ -366,6 +366,16 @@ class Tracd(Basic):
35 self.vhost_server_uid = get_user('tracd')
36 self.vhost_server_gid = get_group('tracd')
37
38 +class uWSGI(Basic):
39 +
40 + name = 'uWSGI'
41 + desc = 'supports installation on uWSGI'
42 + dep = 'www-servers/uwsgi'
43 +
44 + def set_server_user(self):
45 + self.vhost_server_uid = get_user('uwsgi')
46 + self.vhost_server_gid = get_group('uwsgi')
47 +
48 def listservers():
49
50 OUT.notice('\n'.join(['apache',
51 @@ -373,4 +383,5 @@ def listservers():
52 'cherokee',
53 'nginx',
54 'gatling',
55 - 'tracd',]))
56 + 'tracd',
57 + 'uwsgi',]))
58
59 diff --git a/config/webapp-config b/config/webapp-config
60 index da01bc6..e8d1d8a 100755
61 --- a/config/webapp-config
62 +++ b/config/webapp-config
63 @@ -70,6 +70,7 @@ vhost_hostname="localhost"
64 # nginx
65 # gatling
66 # tracd
67 +# uwsgi
68
69 #
70 # you can override this setting by using the -s switch to webapp-config