Attachment #147826 for bug #211996

Lines 1290-1296 Link Here

(-)/usr/lib64/python2.4/site-packages/WebappConfig.orig/config.py (-1 / +2 lines)
1290	allowed_servers = {'apache' : WebappConfig.server.Apache,	1290	allowed_servers = {'apache' : WebappConfig.server.Apache,
1291	'lighttpd' : WebappConfig.server.Lighttpd,	1291	'lighttpd' : WebappConfig.server.Lighttpd,
1292	'aolserver': WebappConfig.server.Aolserver,	1292	'aolserver': WebappConfig.server.Aolserver,
1293	'cherokee' : WebappConfig.server.Cherokee}	1293	'cherokee' : WebappConfig.server.Cherokee,
		1294	'nginx' : WebappConfig.server.Nginx}
1294		1295
1295	server = self.config.get('USER', 'vhost_server')	1296	server = self.config.get('USER', 'vhost_server')
1296		1297




        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')

def listservers():

    OUT.notice('\n'.join(['apache',
                          'aolserver',
                          'lighttpd',
                          'cherokee',
                          'nginx']))

Return to bug 211996

Lines 336-344 Link Here

(-)/usr/lib64/python2.4/site-packages/WebappConfig.orig/server.py (-1 / +12 lines)
336	self.vhost_server_uid = get_user('cherokee')	336	self.vhost_server_uid = get_user('cherokee')
337	self.vhost_server_gid = get_group('cherokee')	337	self.vhost_server_gid = get_group('cherokee')
338		338
		339	class Nginx(Basic):
		340
		341	name = 'Nginx'
		342	desc = 'supports installation on Nginx'
		343	dep = 'www-servers/nginx'
		344
		345	def set_server_user(self):
		346	self.vhost_server_uid = get_user('nginx')
		347	self.vhost_server_gid = get_group('nginx')
		348
339	def listservers():	349	def listservers():
340		350
341	OUT.notice('\n'.join(['apache',	351	OUT.notice('\n'.join(['apache',
342	'aolserver',	352	'aolserver',
343	'lighttpd',	353	'lighttpd',
344	'cherokee']))	354	'cherokee',
		355	'nginx']))