Attachment #297079 for bug #386505

View | Details | Raw Unified | Return to bug 386505
Collapse All | Expand All




        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'

def listservers():

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

Lines 65-71 vhost_hostname="localhost" Link Here

(-)a/config/webapp-config (-1 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
71	#	70	#

Lines 242-248 Link Here

(-)a/doc/webapp.eclass.5.xml (-2 / +1 lines)
242	<term><command>webapp_server_configfile</command> <replaceable>server</replaceable> <replaceable>file</replaceable> <replaceable>newfile</replaceable></term>	242	<term><command>webapp_server_configfile</command> <replaceable>server</replaceable> <replaceable>file</replaceable> <replaceable>newfile</replaceable></term>
243	<listitem>	243	<listitem>
244	<para>Use this function to install a webserver configuration file. The configuration file is installed into ${MY_SERVERCONFIGDIR}, and <command>webapp-config</command> will install this file during install (-I mode).</para>	244	<para>Use this function to install a webserver configuration file. The configuration file is installed into ${MY_SERVERCONFIGDIR}, and <command>webapp-config</command> will install this file during install (-I mode).</para>
245	<para><replaceable>server</replaceable> is one of: apache, lighttpd, aolserver.</para>	245	<para><replaceable>server</replaceable> is one of: apache, lighttpd, cherokee.</para>
246	<para><replaceable>file</replaceable> is a webserver configuration file in ${S}. This should be a configuration file tested with <replaceable>server</replaceable>.</para>	246	<para><replaceable>file</replaceable> is a webserver configuration file in ${S}. This should be a configuration file tested with <replaceable>server</replaceable>.</para>
247	<para><replaceable>newfile</replaceable> is the new name for <replaceable>file</replaceable>. This parameter is optional; if not supplied, <replaceable>newfile</replaceable> is set to <userinput>`basename <replaceable>file</replaceable>`</userinput>.</para>	247	<para><replaceable>newfile</replaceable> is the new name for <replaceable>file</replaceable>. This parameter is optional; if not supplied, <replaceable>newfile</replaceable> is set to <userinput>`basename <replaceable>file</replaceable>`</userinput>.</para>
248	</listitem>	248	</listitem>
249	-

Return to bug 386505

Lines 324-339 class Lighttpd(Basic): Link Here

(-)a/WebappConfig/server.py (-11 lines)
324	self.vhost_server_uid = get_user('lighttpd')	324	self.vhost_server_uid = get_user('lighttpd')
325	self.vhost_server_gid = get_group('lighttpd')	325	self.vhost_server_gid = get_group('lighttpd')
326		326
327	class Aolserver(Basic):
328
329	name = 'Aolserver'
330	desc = 'supports installation on Aolserver'
331	dep = 'www-servers/aolserver'
332
333	def set_server_user(self):
334	self.vhost_server_uid = get_user('aolserver')
335	self.vhost_server_gid = get_group('aolserver')
336
337	class Cherokee(Basic):	327	class Cherokee(Basic):
338		328
339	name = 'Cherokee'	329	name = 'Cherokee'
Lines 347-352 class Cherokee(Basic): Link Here
347	def listservers():	337	def listservers():
348		338
349	OUT.notice('\n'.join(['apache',	339	OUT.notice('\n'.join(['apache',
350	'aolserver',
351	'lighttpd',	340	'lighttpd',
352	'cherokee']))	341	'cherokee']))