| 1 |
commit: 6f3066be9c76c60b1fd9cb7d863ad76dccd3ce39 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 31 01:11:28 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 31 01:11:28 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=6f3066be |
| 7 |
|
| 8 |
Add support for www-servers/nginx and www-servers/gatling |
| 9 |
|
| 10 |
--- |
| 11 |
WebappConfig/config.py | 6 ++++-- |
| 12 |
WebappConfig/server.py | 24 +++++++++++++++++++++++- |
| 13 |
config/webapp-config | 3 +++ |
| 14 |
3 files changed, 30 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/WebappConfig/config.py b/WebappConfig/config.py |
| 17 |
index 65f8efa..9ac303e 100644 |
| 18 |
--- a/WebappConfig/config.py |
| 19 |
+++ b/WebappConfig/config.py |
| 20 |
@@ -1434,8 +1434,10 @@ class Config: |
| 21 |
|
| 22 |
allowed_servers = {'apache' : WebappConfig.server.Apache, |
| 23 |
'lighttpd' : WebappConfig.server.Lighttpd, |
| 24 |
- 'aolserver': WebappConfig.server.Aolserver, |
| 25 |
- 'cherokee' : WebappConfig.server.Cherokee} |
| 26 |
+ 'cherokee' : WebappConfig.server.Cherokee, |
| 27 |
+ 'nginx' : WebappConfig.server.Nginx, |
| 28 |
+ 'gatling' : WebappConfig.server.Gatling} |
| 29 |
+ |
| 30 |
|
| 31 |
server = self.config.get('USER', 'vhost_server') |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/WebappConfig/server.py b/WebappConfig/server.py |
| 35 |
index 5aece77..2272d76 100644 |
| 36 |
--- a/WebappConfig/server.py |
| 37 |
+++ b/WebappConfig/server.py |
| 38 |
@@ -334,8 +334,30 @@ class Cherokee(Basic): |
| 39 |
self.vhost_server_uid = get_user('cherokee') |
| 40 |
self.vhost_server_gid = get_group('cherokee') |
| 41 |
|
| 42 |
+class Nginx(Basic): |
| 43 |
+ |
| 44 |
+ name = 'Nginx' |
| 45 |
+ desc = 'supports installation on Nginx' |
| 46 |
+ dep = 'www-servers/nginx' |
| 47 |
+ |
| 48 |
+ def set_server_user(self): |
| 49 |
+ self.vhost_server_uid = get_user('nginx') |
| 50 |
+ self.vhost_server_gid = get_group('nginx') |
| 51 |
+ |
| 52 |
+class Gatling(Basic): |
| 53 |
+ |
| 54 |
+ name = 'Gatling' |
| 55 |
+ desc = 'supports installation on Gatling' |
| 56 |
+ dep = 'www-servers/gatling' |
| 57 |
+ |
| 58 |
+ def set_server_user(self): |
| 59 |
+ self.vhost_server_uid = get_user('gatling') |
| 60 |
+ self.vhost_server_gid = get_group('gatling') |
| 61 |
+ |
| 62 |
def listservers(): |
| 63 |
|
| 64 |
OUT.notice('\n'.join(['apache', |
| 65 |
'lighttpd', |
| 66 |
- 'cherokee'])) |
| 67 |
+ 'cherokee', |
| 68 |
+ 'nginx', |
| 69 |
+ 'gatling'])) |
| 70 |
|
| 71 |
diff --git a/config/webapp-config b/config/webapp-config |
| 72 |
index 9ec126b..b93c314 100755 |
| 73 |
--- a/config/webapp-config |
| 74 |
+++ b/config/webapp-config |
| 75 |
@@ -67,6 +67,9 @@ vhost_hostname="localhost" |
| 76 |
# apache |
| 77 |
# lighttpd |
| 78 |
# cherokee |
| 79 |
+# nginx |
| 80 |
+# gatling |
| 81 |
+ |
| 82 |
# |
| 83 |
# you can override this setting by using the -s switch to webapp-config |
Archives