summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--WebappConfig/server.py11
-rwxr-xr-xconfig/webapp-config1
-rw-r--r--doc/webapp.eclass.5.xml2
3 files changed, 1 insertions, 13 deletions
diff --git a/WebappConfig/server.py b/WebappConfig/server.py
index 0e3ac73..8779475 100644
--- a/WebappConfig/server.py
+++ b/WebappConfig/server.py
@@ -324,16 +324,6 @@ class Lighttpd(Basic):
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'
@@ -347,6 +337,5 @@ class Cherokee(Basic):
def listservers():
OUT.notice('\n'.join(['apache',
- 'aolserver',
'lighttpd',
'cherokee']))
diff --git a/config/webapp-config b/config/webapp-config
index 532006c..9ec126b 100755
--- a/config/webapp-config
+++ b/config/webapp-config
@@ -65,7 +65,6 @@ vhost_hostname="localhost"
# your choices are:
#
# apache
-# aolserver
# lighttpd
# cherokee
#
diff --git a/doc/webapp.eclass.5.xml b/doc/webapp.eclass.5.xml
index e9bd4ff..f310f56 100644
--- a/doc/webapp.eclass.5.xml
+++ b/doc/webapp.eclass.5.xml
@@ -242,7 +242,7 @@
<term><command>webapp_server_configfile</command> <replaceable>server</replaceable> <replaceable>file</replaceable> <replaceable>newfile</replaceable></term>
<listitem>
<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>
- <para><replaceable>server</replaceable> is one of: apache, lighttpd, aolserver.</para>
+ <para><replaceable>server</replaceable> is one of: apache, lighttpd, cherokee.</para>
<para><replaceable>file</replaceable> is a webserver configuration file in ${S}. This should be a configuration file tested with <replaceable>server</replaceable>.</para>
<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>
</listitem>