changeset 3425:1729bf752c83

merged main
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Fri, 28 Mar 2008 16:11:13 +0100
parents aa3890b17212 (current diff) 6fa56b0f0de4 (diff)
children 79dd730d6455
files
diffstat 2 files changed, 23 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Mar 28 16:09:29 2008 +0100
+++ b/.hgignore	Fri Mar 28 16:11:13 2008 +0100
@@ -5,4 +5,4 @@
 wiki/data/edit-log
 wiki/data/event-log
 wiki/data/cache
-
+wikiconfig_local.*
--- a/wikiconfig.py	Fri Mar 28 16:09:29 2008 +0100
+++ b/wikiconfig.py	Fri Mar 28 16:11:13 2008 +0100
@@ -9,7 +9,7 @@
 from MoinMoin.config.multiconfig import DefaultConfig
 
 
-class Config(DefaultConfig):
+class LocalConfig(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')
@@ -23,3 +23,24 @@
     page_front_page = u'FrontPage' # change to some better value
     # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^
 
+
+    # Add your configuration items here.
+
+
+
+# DEVELOPERS! Do not add your configuration items there,
+# you could accidentally commit them! Instead, create a
+# wikiconfig_local.py file containing this:
+#
+# from wikiconfig import LocalConfig
+#
+# class Config(LocalConfig):
+#     configuration_item_1 = 'value1'
+#
+
+try:
+    from wikiconfig_local import Config
+except ImportError, err:
+    if not str(err).endswith('wikiconfig_local'):
+        raise
+    Config = LocalConfig