ChangeSet ID: 1117206916559062077737511
CVSROOT: /cvsroot/wine
Module name: wiki
Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/05/27 08:15:16
Modified files:
. : wikiconfig.py winewiki.conf
Log message:
Change the prefix from moin/ to the standard wiki/, it's required
by Twisted and Standalone.
Fix the name of the logo, it was renamed a while ago.
Old revision New revision Changes Path
1.3 1.4 +2 -2 wiki/wikiconfig.py
1.1 1.2 +1 -1 wiki/winewiki.conf
Index: wiki/wikiconfig.py
diff -u -p wiki/wikiconfig.py:1.3 wiki/wikiconfig.py:1.4
--- wiki/wikiconfig.py 27 May 2005 15:15:16 -0000
+++ /dev/null 27 May 2005 15:15:16 -0000
@@ -38,7 +38,7 @@ class Config(DefaultConfig):
# Wiki logo. You can use an image, text or both. [Unicode]
# Example: u'<img src="/wiki/mywiki.png" alt="My Wiki">My Wiki'
# For no logo or text, use ''
- logo_string = '<img src="/winewikilogo.png" width="230" height="99" border="0" alt="Wine Wiki" />'
+ logo_string = '<img src="/logo.png" width="230" height="99" border="0" alt="Wine Wiki" />'
# The interwiki name used in interwiki links
interwikiname = 'WineWiki'
@@ -65,7 +65,7 @@ class Config(DefaultConfig):
# This must be '/wiki' for twisted and standalone. For CGI, it should
# match your Apache Alias setting.
- url_prefix = '/moin'
+ url_prefix = '/wiki'
# Security ----------------------------------------------------------
Index: wiki/winewiki.conf
diff -u -p wiki/winewiki.conf:1.1 wiki/winewiki.conf:1.2
--- wiki/winewiki.conf 27 May 2005 15:15:16 -0000
+++ /dev/null 27 May 2005 15:15:16 -0000
@@ -8,7 +8,7 @@
<VirtualHost *:80>
ServerName wiki.winehq.org
ServerAlias wiki.winehq.com
- Alias /moin/ "/usr/share/moin/htdocs/"
+ Alias /wiki/ "/usr/share/moin/htdocs/"
Alias /favicon.ico "/var/www/wine/wiki/favicon.ico"
Alias /logo.png "/var/www/wine/wiki/logo.png"
ScriptAlias / "/var/www/wine/wiki/moin.cgi/"
ChangeSet ID: 1117204515789134157662378
CVSROOT: /cvsroot/wine
Module name: wiki
Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2005/05/27 07:35:15
Added files:
. : mointwisted.py
Log message:
Add the original config file for running the Wiki under TwistedWeb.
Old revision New revision Changes Path
Added 1.1 +0 -0 wiki/mointwisted.py
Index: wiki/mointwisted.py
diff -u -p /dev/null wiki/mointwisted.py:1.1
--- wiki/mointwisted.py 27 May 2005 14:35:15 -0000
+++ /dev/null 27 May 2005 14:35:15 -0000
@@ -0,0 +1,76 @@
+"""
+ twisted.web based wiki server
+
+ Run this server with mointwisted script on Linux or Mac OS X, or
+ mointwisted.cmd on Windows.
+
+ @copyright: 2004-2005 Thomas Waldmann, Oliver Graf, Nir Soffer
+ @license: GNU GPL, see COPYING for details.
+"""
+
+# System path configuration
+
+import sys
+
+# Path of the directory where wikiconfig.py is located.
+# YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
+sys.path.insert(0, '/path/to/wikiconfig')
+
+# Path to MoinMoin package, needed if you installed with --prefix=PREFIX
+# or if you did not use setup.py
+## sys.path.insert(0, 'PREFIX/lib/python2.3/site-packages')
+
+# Path to the directory where farmconfig is located (if different).
+## sys.path.insert(0, '/path/to/farmconfig')
+
+
+from MoinMoin.server.twistedmoin import TwistedConfig, makeApp
+
+
+class Config(TwistedConfig):
+
+ # Path to moin shared files (default '/usr/share/moin/wiki/htdocs')
+ docs = '/usr/share/moin/htdocs'
+
+ # The server will run with as this user and group (default 'www-data')
+ user = 'www-data'
+ group = 'www-data'
+
+ # Port (default 8080)
+ # To serve privileged port under 1024 you will have to run as root
+ port = 8080
+
+ # Interfaces (default [''])
+ # The interfaces the server will listen to.
+ # [''] - listen to all interfaces defined on the server
+ # ['red.wikicolors.org', 'blue.wikicolors.org'] - listen to some
+ # If '' is in the list, other ignored.
+ interfaces = ['']
+
+ # How many threads to use (default 10, max 20)
+ # The more threads you use, the more memory moin uses. All thread
+ # use one CPU, and will not run faster, but might be more responsive
+ # on a very busy server.
+ threads = 10
+
+ # Set logfile name (default commented)
+ # This is the *Apache compatible* log file, not the twisted-style logfile.
+ # Leaving this as None will have no Apache compatible log file. Apache
+ # compatible logfiles are useful because there are quite a few programs
+ # which analyze them and display statistics.
+ ## logPath = 'mointwisted.log'
+
+ # Memory profile (default commented)
+ # Useful only if you are a developer or interested in moin memory usage
+ ## from MoinMoin.util.profile import TwistedProfiler
+ ## memoryProfile = TwistedProfiler('mointwisted',
+ ## requestsPerSample=100,
+ ## collect=0)
+
+ # Hotshot profile (default commented)
+ ## hotshotProfile = "mointwisted.prof"
+
+
+# Create the application
+application = makeApp(Config)
+