wiki/. wikiconfig.py winewiki.conf

[Dimi Paun]

ChangeSet ID:	1117206916559062077737511
CVSROOT:	/cvsroot/wine
Module name:	wiki
Changes by:	[e-mail]	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/"