changeset 312:40d31045feb4

make underlay (including fix to make it work), make install-docs imported from: moin--main--1.5--patch-316
author Thomas Waldmann <tw@waldmann-edv.de>
date Tue, 13 Dec 2005 13:25:06 +0000
parents 6ab8c171e491
children e341b54060c3
files MoinMoin/auth.py MoinMoin/scripts/reducewiki/reducewiki.py docs/INSTALL.html wiki/underlay.tar.bz2
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/auth.py	Tue Dec 13 12:47:35 2005 +0000
+++ b/MoinMoin/auth.py	Tue Dec 13 13:25:06 2005 +0000
@@ -91,7 +91,7 @@
 	 
 def http(request, **kw):
     """ authenticate via http basic/digest/ntlm auth """
-    from MoinMoin.request import RequestTwisted
+    from MoinMoin.request import RequestTwisted, RequestCLI
     u = None
     # check if we are running Twisted
     if isinstance(request, RequestTwisted):
@@ -102,7 +102,7 @@
         u = user.User(request, auth_username=username, password=password,
                       auth_method='http', auth_attribs=())
 
-    else:
+    elif not isinstance(request, RequestCLI):
         env = request.env
         auth_type = env.get('AUTH_TYPE','')
         if auth_type in ['Basic', 'Digest', 'NTLM', 'Negotiate',]:
--- a/MoinMoin/scripts/reducewiki/reducewiki.py	Tue Dec 13 12:47:35 2005 +0000
+++ b/MoinMoin/scripts/reducewiki/reducewiki.py	Tue Dec 13 13:25:06 2005 +0000
@@ -41,7 +41,7 @@
 destdir = 'underlay'
 
 import sys
-sys.path.insert(0, '/org/de.wikiwikiweb.moinmaster/bin') # farmconfig/wikiconfig location
+sys.path.insert(0, '/org/de.wikiwikiweb.moinmaster/bin15') # farmconfig/wikiconfig location
 sys.path.insert(0, '../../..')
 
 import os, os.path, shutil, codecs
--- a/docs/INSTALL.html	Tue Dec 13 12:47:35 2005 +0000
+++ b/docs/INSTALL.html	Tue Dec 13 13:25:06 2005 +0000
@@ -294,7 +294,7 @@
 <h2 id="head-6e91ed0b234e903763a945b5249e7de8b726e5d7">Security warnings</h2>
 
 <span id="line-20" class="anchor"></span><span id="line-21" class="anchor"></span><div>
-<table style="color: red">
+<table>
 <tr>
 <td>
 <p> <img src="wiki/htdocs/modern/img/alert.png" alt="/!\" height="15" width="15"> <strong>Warning: make sure that your <tt>data</tt> directory and your configuration files are not accessible through your web server. Do not put your wiki directory in <tt>public_html</tt>, <tt>Sites</tt> or any other directory your web server can access. The web server only needs to access the file in the <tt>htdocs</tt> directory and the <tt>moin.cgi</tt> script! (Or whatever script your server uses to start Moin<tt></tt>Moin.)</strong> </p>
@@ -303,7 +303,7 @@
 <span id="line-22" class="anchor"></span></table>
 </div>
 <span id="line-23" class="anchor"></span><div>
-<table style="color: red">
+<table>
 <tr>
 <td>
 <p> <img src="wiki/htdocs/modern/img/alert.png" alt="/!\" height="15" width="15"> <strong>Warning: make sure that the <tt>data</tt> directory and its subdirectories are not readable and not writeable by users other than the web server user. If you need to give worldwide read-write permissions to get it working, be aware that you are doing a very unsecure setup, that can be compromised by any other user or program on your computer.</strong> </p>
@@ -1558,7 +1558,7 @@
 <span id="line-17" class="anchor"></span><p>Many users prefer to install software products in a folder other than the installation default. Python typically changes the default installation folder name with each point release, and Apache has changed the default installation folder name with the release of version 2.  Instead of enumerating all the possibilities at each step, this procedure will use the <strong>Reference</strong> name in the table below as the installed location for each product. Substitute your real installation location when editing configuration files and entering commands. <span id="line-18" class="anchor"></span></p>
 <span id="line-19" class="anchor"></span><div>
 <table>
-<tr style="background-color: #EEDDAA;">
+<tr>
 <td>
 <p>Reference</p>
 </td>
Binary file wiki/underlay.tar.bz2 has changed