Attachment #192728 for bug #211996

Lines 1289-1296 Link Here

(-)WebappConfig/config.py (-2 / +3 lines)
1289		1289
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	'cherokee' : WebappConfig.server.Cherokee,
1293	'cherokee' : WebappConfig.server.Cherokee}	1293	'nginx' : WebappConfig.server.Nginx,
		1294	'gatling' : WebappConfig.server.Gatling}
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('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'

        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',
			  'nginx',
			  'gatling']))

Lines 65-73 Link Here

(-)config/webapp-config (-1 / +2 lines)
65	# your choices are:	65	# your choices are:
66	#	66	#
67	# apache	67	# apache
68	# aolserver
69	# lighttpd	68	# lighttpd
70	# cherokee	69	# cherokee
		70	# nginx
		71	# gatling
71	#	72	#
72	# you can override this setting by using the -s switch to webapp-config	73	# you can override this setting by using the -s switch to webapp-config
73		74

Return to bug 211996

Lines 316-331 Link Here

(-)WebappConfig/server.py (-12 / +23 lines)
316	self.vhost_server_uid = get_user('lighttpd')	316	self.vhost_server_uid = get_user('lighttpd')
317	self.vhost_server_gid = get_group('lighttpd')	317	self.vhost_server_gid = get_group('lighttpd')
318		318
319	class Aolserver(Basic):
320
321	name = 'Aolserver'
322	desc = 'supports installation on Aolserver'
323	dep = 'www-servers/aolserver'
324
325	def set_server_user(self):
326	self.vhost_server_uid = get_user('aolserver')
327	self.vhost_server_gid = get_group('aolserver')
328
329	class Cherokee(Basic):	319	class Cherokee(Basic):
330		320
331	name = 'Cherokee'	321	name = 'Cherokee'
Lines 336-344 Link Here
336	self.vhost_server_uid = get_user('cherokee')	326	self.vhost_server_uid = get_user('cherokee')
337	self.vhost_server_gid = get_group('cherokee')	327	self.vhost_server_gid = get_group('cherokee')
338		328
		329	class Nginx(Basic):
		330
		331	name = 'Nginx'
		332	desc = 'supports installation on Nginx'
		333	dep = 'www-servers/nginx'
		334
		335	def set_server_user(self):
		336	self.vhost_server_uid = get_user('nginx')
		337	self.vhost_server_gid = get_group('nginx')
		338
		339	class Gatling(Basic):
		340
		341	name = 'Gatling'
		342	desc = 'supports installation on Gatling'
		343	dep = 'www-servers/gatling'
		344
		345	def set_server_user(self):
		346	self.vhost_server_uid = get_user('gatling')
		347	self.vhost_server_gid = get_group('gatling')
		348
339	def listservers():	349	def listservers():
340		350
341	OUT.notice('\n'.join(['apache',	351	OUT.notice('\n'.join(['apache',
342	'aolserver',
343	'lighttpd',	352	'lighttpd',
344	'cherokee']))	353	'cherokee',
		354	'nginx',
		355	'gatling']))