changeset 1599:c001386fc59b

fix moin.py and wikiconfig.py, move MMDE wikiconfig.py to toplevel dir
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 02 Oct 2006 16:40:51 +0200
parents dec11b291ba5
children 8ae09c7fa2be
files contrib/DesktopEdition/wikiconfig.py wiki/server/moin.py wikiconfig.py
diffstat 3 files changed, 28 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/DesktopEdition/wikiconfig.py	Mon Oct 02 16:21:38 2006 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# -*- coding: iso-8859-1 -*-
-"""MoinMoin Desktop Edition (MMDE) - Configuration
-
-ONLY to be used for MMDE - if you run a personal wiki on your notebook or PC.
-
-This is NOT intended for internet or server or multiuser use due to relaxed security settings!
-"""
-
-from MoinMoin.multiconfig import DefaultConfig
-
-class Config(DefaultConfig):
-    # vvv DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO vvv
-    moinmoin_dir = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0])))
-    data_dir = os.path.join(moinmoin_dir, 'wiki', 'data')
-    data_underlay_dir = os.path.join(moinmoin_dir, 'wiki', 'underlay')
-
-    DesktopEdition = True # give all local users full powers
-    acl_rights_default = u"All:read,write,delete,revert,admin"
-    sitename = u'MoinMoin DesktopEdition'
-    logo_string = u'<img src="/wiki/common/moinmoin.png" alt="MoinMoin Logo">'
-    page_front_page = u'FrontPage' # change to some better value
-    page_credits = [
-        '<a href="http://moinmoin.wikiwikiweb.de/">MoinMoin DesktopEdition Powered</a>',
-        '<a href="http://www.python.org/">Python Powered</a>',
-    ]
-    # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^
-
--- a/wiki/server/moin.py	Mon Oct 02 16:21:38 2006 +0200
+++ b/wiki/server/moin.py	Mon Oct 02 16:40:51 2006 +0200
@@ -54,7 +54,7 @@
 print
 
 
-class Config(StandaloneConfig):
+class DefaultConfig(StandaloneConfig):
 
     # Server name
     # Used to create .log, .pid and .prof files
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wikiconfig.py	Mon Oct 02 16:40:51 2006 +0200
@@ -0,0 +1,27 @@
+# -*- coding: iso-8859-1 -*-
+"""MoinMoin Desktop Edition (MMDE) - Configuration
+
+ONLY to be used for MMDE - if you run a personal wiki on your notebook or PC.
+
+This is NOT intended for internet or server or multiuser use due to relaxed security settings!
+"""
+import sys, os
+from MoinMoin.config.multiconfig import DefaultConfig
+
+class Config(DefaultConfig):
+    # vvv DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO vvv
+    moinmoin_dir = os.path.abspath(os.path.normpath(os.path.dirname(sys.argv[0])))
+    data_dir = os.path.join(moinmoin_dir, 'wiki', 'data')
+    data_underlay_dir = os.path.join(moinmoin_dir, 'wiki', 'underlay')
+
+    DesktopEdition = True # give all local users full powers
+    acl_rights_default = u"All:read,write,delete,revert,admin"
+    sitename = u'MoinMoin DesktopEdition'
+    logo_string = u'<img src="/wiki/common/moinmoin.png" alt="MoinMoin Logo">'
+    page_front_page = u'FrontPage' # change to some better value
+    page_credits = [
+        '<a href="http://moinmoin.wikiwikiweb.de/">MoinMoin DesktopEdition Powered</a>',
+        '<a href="http://www.python.org/">Python Powered</a>',
+    ]
+    # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^
+