--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- WebappConfig/config.py      2009-05-10 02:09:31.000000000 -0400        
+++ config.py   2009-05-10 02:11:19.000000000 -0400                        
@@ -1295,8 +1295,9 @@ 
                                                                           
         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')                  
                                                                           
--- WebappConfig/server.py      2009-05-10 02:09:31.000000000 -0400        
+++ server.py   2009-05-10 02:11:35.000000000 -0400                        
@@ -316,16 +316,6 @@ 
         self.vhost_server_uid = get_user('lighttpd')                      
         self.vhost_server_gid = get_group('lighttpd')                     
                                                                           
-class Aolserver(Basic):                                                   
-                                                                          
-    name   = 'Aolserver'                                                  
-    desc   = 'supports installation on Aolserver'                         
-    dep    = 'www-servers/aolserver'                                      
-                                                                          
-    def set_server_user(self):                                            
-        self.vhost_server_uid = get_user('aolserver')                     
-        self.vhost_server_gid = get_group('aolserver')                    
-                                                                          
 class Cherokee(Basic):                                                    
                                                                           
     name   = 'Cherokee'                                                   
@@ -336,9 +326,31 @@ 
         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',
                           'aolserver',
                           'lighttpd',
-                          'cherokee']))
+                          'cherokee',
+                         'nginx',
+                         'gatling']))
--- config/webapp-config        2009-05-10 02:09:31.000000000 -0400
+++ webapp-config       2009-05-10 02:11:44.000000000 -0400
@@ -65,9 +65,10 @@ 
 # your choices are:
 #
 # apache
-# aolserver
 # lighttpd
 # cherokee
+# nginx
+# gatling
 #
 # you can override this setting by using the -s switch to webapp-config