X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fwipi.git;a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=3ad8251eafd6b9b873548dec4a0516e312e876d8;hp=b4011c71a86e0fb99d78355a4b6677183b902ba1;hb=212e4b7e56012b4a04df1f1e9180b9c521aaead1;hpb=a4579debe2c4ad40692bcb3dd9ed135af1a30947

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index b4011c7..3ad8251 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -1,17 +1,9 @@
-# -*- coding: iso-8859-1 -*-
-# IMPORTANT! This encoding (charset) setting MUST be correct! If you live in a
-# western country and you don't know that you use utf-8, you probably want to
-# use iso-8859-1 (or some other iso charset). If you use utf-8 (a Unicode
-# encoding) you MUST use: coding: utf-8
-# That setting must match the encoding your editor uses when you modify the
-# settings below. If it does not, special non-ASCII chars will be wrong.
+# -*- coding: utf-8 -*-
+# IMPORTANT! This encoding (charset) setting MUST be correct!
 
 """
     MoinMoin - Configuration for a wiki farm
 
-    If you run a single wiki only, you can keep the "wikis" list "as is"
-    (it has a single rule mapping all requests to mywiki.py).
-
     Note that there are more config options than you'll find in
     the version of this file that is installed by default; see
     the module MoinMoin.config.multiconfig for a full list of names and their
@@ -47,11 +39,13 @@ wikis = [
     # ---------------------------------------------------------------
     ("extinction", r"extinction.evolution-events.nl/wipi"),
     ("exodus", r"exodus.evolution-events.nl/wipi"),
+    ("deadfoxjunction", r"deadfoxjunction.evolution-events.nl/wipi"),
     # Pretend we're also available at /. In reality, only the /Site pages are
     # available there due to lighttpd rewriting. Due to proper setting of
     # script-name by lighttpd and the url_mappings setting below all links
     # still work too!
     ("exodus", r"exodus.evolution-events.nl"),
+    ("deadfoxjunction", r"deadfoxjunction.evolution-events.nl"),
 ]
 
 
@@ -81,17 +75,6 @@ class FarmConfig(DefaultConfig):
 
     # Critical setup  ---------------------------------------------------
 
-    # Misconfiguration here will render your wiki unusable. Check that
-    # all directories are accessible by the web server or moin server.
-
-    # If you encounter problems, try to set data_dir and data_underlay_dir
-    # to absolute paths.
-
-    # Where your mutable wiki pages are. You want to make regular
-    # backups of this directory.
-    #data_dir = './data/'
-    # Will be set by individual configs
-
     # Where read-only system and help page are. You might want to share
     # this directory between several wikis. When you update MoinMoin,
     # you can safely replace the underlay directory with a new one. This
@@ -116,20 +99,10 @@ class FarmConfig(DefaultConfig):
 
     # Security ----------------------------------------------------------
 
-    # This is checked by some rather critical and potentially harmful actions,
-    # like despam or PackageInstaller action:
-    #superuser = [u"YourName", ]
-
-    # IMPORTANT: grant yourself admin rights! replace YourName with
-    # your user name. See HelpOnAccessControlLists for more help.
-    # All acl_rights_xxx options must use unicode [Unicode]
-    #acl_rights_before = u"YourName:read,write,delete,revert,admin"
-
     # Link spam protection for public wikis (uncomment to enable).
     # Needs a reliable internet connection.
     #from MoinMoin.security.antispam import SecurityPolicy
 
-        
     acl_hierarchic = True
 
     # Give users all rights, but don't give any rights to anonymous users
@@ -138,17 +111,7 @@ class FarmConfig(DefaultConfig):
 
     # Mail --------------------------------------------------------------
 
-    # Configure to enable subscribing to pages (disabled by default) or
-    # sending forgotten passwords.
-
-    # SMTP server, e.g. "mail.provider.com" (empty or None to disable mail)
-    #mail_smarthost = ""
-
-    # The return address, e.g u"Jürgen Wiki <noreply@mywiki.org>" [Unicode]
-    #mail_from = u""
-
-    # "user pwd" if you need to use SMTP AUTH
-    #mail_login = ""
+    # Not configured
 
 
     # User interface ----------------------------------------------------
@@ -160,8 +123,6 @@ class FarmConfig(DefaultConfig):
     # page names for system and help pages, those will be used automatically
     # according to the user selected language. [Unicode]
     navi_bar = [
-        # If you want to show your page_front_page here:
-        #u'%(page_front_page)s',
         u'RecentChanges',
         u'FindPage',
         u'HelpContents',
@@ -173,9 +134,6 @@ class FarmConfig(DefaultConfig):
 
     # Language options --------------------------------------------------
 
-    # See http://moinmo.in/ConfigMarket for configuration in
-    # YOUR language that other people contributed.
-
     # The main wiki language, set the direction of the wiki pages
     language_default = 'en'
 
@@ -195,9 +153,6 @@ class FarmConfig(DefaultConfig):
     show_interwiki = 1
     logo_string = u''
 
-    # Enable graphical charts, requires gdchart.
-    #chart_options = {'width': 600, 'height': 300}
-
     # The GUI WYSISYG editor is not installed with Debian.
     # See /usr/share/doc/$(cdbs_curpkg)/README.Debian for more info
     editor_force = True
@@ -208,7 +163,6 @@ class FarmConfig(DefaultConfig):
     from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname
     phpbb = mysql_login(
         name    = 'phpbb',
-        verbose = True,
         dbhost  = phpbb_dbhost,
         dbuser  = phpbb_dbuser,
         dbpass  = phpbb_dbpass,