[cvs-annodex] commit (/annodex): cmmlwiki/trunk/README +cmmlwiki/trunk/apache/ +cmmlwiki/trunk/apache/cmmlwiki.conf

[conrad]

Update of /annodex (new revision 1529)

Added files:
   cmmlwiki/trunk/apache/
   cmmlwiki/trunk/apache/cmmlwiki.conf

Modified files:
   cmmlwiki/trunk/README

Log Message:
add example apache config stub, and update README accordingly


Modified: cmmlwiki/trunk/README
===================================================================
--- cmmlwiki/trunk/README	2005-09-27 12:32:34 UTC (rev 1528)
+++ cmmlwiki/trunk/README	2005-09-28 13:11:41 UTC (rev 1529)
@@ -37,30 +37,13 @@
 Configuration
 -------------
 
-CMMLWiki must be configured as a CGI script for execution by your web server.
+CMMLWiki must be configured as a CGI script for execution by your web server,
+and its default HTML documents are expected to be visible as
+/cmmlwiki-htdocs.
 
-For example, for a cmmlwiki.db installed in /var/local/lib/cmmlwiki/:
+Apache configuration for a cmmlwiki.db installed in /var/local/lib/cmmlwiki/
+is given in apache/cmmlwiki.conf.
 
-  ScriptAlias /cmmlwiki/edit "/usr/share/cmmlwiki/cgi-bin/edit.cgi"
-  ScriptAlias /cmmlwiki/update "/usr/share/cmmlwiki/cgi-bin/update.cgi"
-  ScriptAlias /cmmlwiki/view "/usr/share/cmmlwiki/cgi-bin/view.cgi"
-  ScriptAlias /cmmlwiki/frame_extract "/usr/share/cmmlwiki/cgi-bin/frame_extract.cgi"
-
-  <Location "/cmmlwiki">
-      SetEnv CMMLWIKI_ENV "/var/local/lib/cmmlwiki/"
-  </Location>
-
-Additionally, the default HTML documents are expected to be visible as
-/cmmlwiki-htdocs:
-
-  Alias /cmmlwiki-htdocs/ "/usr/share/cmmlwiki/htdocs/"
-  <Directory "/usr/share/cmmlwiki/htdocs/">
-      Options Indexes MultiViews
-      AllowOverride None
-      Order allow,deny
-      Allow from all
-  </Directory>
-
 Running
 -------
 

Added: cmmlwiki/trunk/apache/cmmlwiki.conf
===================================================================
--- cmmlwiki/trunk/apache/cmmlwiki.conf	2005-09-27 12:32:34 UTC (rev 1528)
+++ cmmlwiki/trunk/apache/cmmlwiki.conf	2005-09-28 13:11:41 UTC (rev 1529)
@@ -0,0 +1,16 @@
+Alias /cmmlwiki-htdocs/ "/usr/share/cmmlwiki/htdocs/"
+<Directory "/usr/share/cmmlwiki/htdocs/">
+    Options Indexes MultiViews
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+ScriptAlias /cmmlwiki/edit "/usr/share/cmmlwiki/cgi-bin/edit.cgi"
+ScriptAlias /cmmlwiki/update "/usr/share/cmmlwiki/cgi-bin/update.cgi"
+ScriptAlias /cmmlwiki/view "/usr/share/cmmlwiki/cgi-bin/view.cgi"
+ScriptAlias /cmmlwiki/frame_extract "/usr/share/cmmlwiki/cgi-bin/frame_extract.cgi"
+
+<Location "/cmmlwiki">
+    SetEnv CMMLWIKI_ENV "/var/local/lib/cmmlwiki/"
+</Location>


-- 
conrad