[gentoo-commits] proj/webapp-config:master commit in: WebappConfig/, config/

[gentoo-commits] proj/webapp-config:master commit in: WebappConfig/, config/

[Anthony G. Basile]

commit:     6f3066be9c76c60b1fd9cb7d863ad76dccd3ce39
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 01:11:28 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 01:11:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=6f3066be

Add support for www-servers/nginx and www-servers/gatling

---
 WebappConfig/config.py |    6 ++++--
 WebappConfig/server.py |   24 +++++++++++++++++++++++-
 config/webapp-config   |    3 +++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/WebappConfig/config.py b/WebappConfig/config.py
index 65f8efa..9ac303e 100644
--- a/WebappConfig/config.py
+++ b/WebappConfig/config.py
@@ -1434,8 +1434,10 @@ class Config:
 
         allowed_servers = {'apache'   : WebappConfig.server.Apache,
                            'lighttpd' : WebappConfig.server.Lighttpd,
-                           'aolserver': WebappConfig.server.Aolserver,
-                           'cherokee' : WebappConfig.server.Cherokee}
+                           'cherokee' : WebappConfig.server.Cherokee,
+                           'nginx'    : WebappConfig.server.Nginx,
+                           'gatling'  : WebappConfig.server.Gatling}
+
 
         server = self.config.get('USER', 'vhost_server')
 

diff --git a/WebappConfig/server.py b/WebappConfig/server.py
index 5aece77..2272d76 100644
--- a/WebappConfig/server.py
+++ b/WebappConfig/server.py
@@ -334,8 +334,30 @@ class Cherokee(Basic):
         self.vhost_server_uid = get_user('cherokee')
         self.vhost_server_gid = get_group('cherokee')
 
+class Nginx(Basic):
+
+    name   = 'Nginx'
+    desc   = 'supports installation on Nginx'
+    dep    = 'www-servers/nginx'
+
+    def set_server_user(self):          
+        self.vhost_server_uid = get_user('nginx')
+        self.vhost_server_gid = get_group('nginx')
+
+class Gatling(Basic):
+
+    name   = 'Gatling'
+    desc   = 'supports installation on Gatling'
+    dep    = 'www-servers/gatling'
+
+    def set_server_user(self):          
+        self.vhost_server_uid = get_user('gatling')
+        self.vhost_server_gid = get_group('gatling')
+
 def listservers():
 
     OUT.notice('\n'.join(['apache',
                           'lighttpd',
-                          'cherokee']))
+                          'cherokee',
+                          'nginx',
+                          'gatling']))

diff --git a/config/webapp-config b/config/webapp-config
index 9ec126b..b93c314 100755
--- a/config/webapp-config
+++ b/config/webapp-config
@@ -67,6 +67,9 @@ vhost_hostname="localhost"
 # apache
 # lighttpd
 # cherokee
+# nginx
+# gatling
+
 #
 # you can override this setting by using the -s switch to webapp-config