| 1 |
commit: 8d1355bfd0fb354f4f09ceddc4069b38fb1e0841 |
| 2 |
Author: Michael (kensington) <gentoo <AT> scribeofthenile <DOT> com> |
| 3 |
AuthorDate: Thu Dec 29 21:16:53 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 29 21:16:53 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=8d1355bf |
| 7 |
|
| 8 |
Remove aolserver and add cherokee to the list of supported |
| 9 |
servers in the manpage. |
| 10 |
|
| 11 |
Reported-By: Fab <netfab <AT> gmail.com> |
| 12 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 13 |
X-Gentoo-Bug: 386505 |
| 14 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=386505 |
| 15 |
|
| 16 |
--- |
| 17 |
WebappConfig/server.py | 11 ----------- |
| 18 |
config/webapp-config | 1 - |
| 19 |
doc/webapp.eclass.5.xml | 2 +- |
| 20 |
3 files changed, 1 insertions(+), 13 deletions(-) |
| 21 |
|
| 22 |
diff --git a/WebappConfig/server.py b/WebappConfig/server.py |
| 23 |
index 0e3ac73..8779475 100644 |
| 24 |
--- a/WebappConfig/server.py |
| 25 |
+++ b/WebappConfig/server.py |
| 26 |
@@ -324,16 +324,6 @@ class Lighttpd(Basic): |
| 27 |
self.vhost_server_uid = get_user('lighttpd') |
| 28 |
self.vhost_server_gid = get_group('lighttpd') |
| 29 |
|
| 30 |
-class Aolserver(Basic): |
| 31 |
- |
| 32 |
- name = 'Aolserver' |
| 33 |
- desc = 'supports installation on Aolserver' |
| 34 |
- dep = 'www-servers/aolserver' |
| 35 |
- |
| 36 |
- def set_server_user(self): |
| 37 |
- self.vhost_server_uid = get_user('aolserver') |
| 38 |
- self.vhost_server_gid = get_group('aolserver') |
| 39 |
- |
| 40 |
class Cherokee(Basic): |
| 41 |
|
| 42 |
name = 'Cherokee' |
| 43 |
@@ -347,6 +337,5 @@ class Cherokee(Basic): |
| 44 |
def listservers(): |
| 45 |
|
| 46 |
OUT.notice('\n'.join(['apache', |
| 47 |
- 'aolserver', |
| 48 |
'lighttpd', |
| 49 |
'cherokee'])) |
| 50 |
|
| 51 |
diff --git a/config/webapp-config b/config/webapp-config |
| 52 |
index 532006c..9ec126b 100755 |
| 53 |
--- a/config/webapp-config |
| 54 |
+++ b/config/webapp-config |
| 55 |
@@ -65,7 +65,6 @@ vhost_hostname="localhost" |
| 56 |
# your choices are: |
| 57 |
# |
| 58 |
# apache |
| 59 |
-# aolserver |
| 60 |
# lighttpd |
| 61 |
# cherokee |
| 62 |
# |
| 63 |
|
| 64 |
diff --git a/doc/webapp.eclass.5.xml b/doc/webapp.eclass.5.xml |
| 65 |
index e9bd4ff..f310f56 100644 |
| 66 |
--- a/doc/webapp.eclass.5.xml |
| 67 |
+++ b/doc/webapp.eclass.5.xml |
| 68 |
@@ -242,7 +242,7 @@ |
| 69 |
<term><command>webapp_server_configfile</command> <replaceable>server</replaceable> <replaceable>file</replaceable> <replaceable>newfile</replaceable></term> |
| 70 |
<listitem> |
| 71 |
<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> |
| 72 |
- <para><replaceable>server</replaceable> is one of: apache, lighttpd, aolserver.</para> |
| 73 |
+ <para><replaceable>server</replaceable> is one of: apache, lighttpd, cherokee.</para> |
| 74 |
<para><replaceable>file</replaceable> is a webserver configuration file in ${S}. This should be a configuration file tested with <replaceable>server</replaceable>.</para> |
| 75 |
<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> |
| 76 |
</listitem> |
Archives