Update mysql_login to moin 1.8.

[matthijs/projects/wipi.git] / conf / farmconfig.py

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 5cce3061aa42a0585864658e5975bb9cbfd55bb4..57175438df8f444aa4447410d140439fd9bb1718 100644 (file)
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -45,11 +45,8 @@ wikis = [
 
     # wikiname,     url regular expression (no protocol)
     # ---------------------------------------------------------------
-    ("exodus", r"exodus.evolution-events.nl/wiki"),
-
-    # for multiple wikis, do something like this:
-    #("moinmoin",    r"^moinmo.in/.*$"),
-    #("moinmaster",  r"^master.moinmo.in/.*$"),
+    ("exodus", r"exodus.evolution-events.nl/wipi"),
+    ("extinction", r"extinction.evolution-events.nl/wipi"),
 ]
 
 
@@ -104,7 +101,7 @@ class FarmConfig(DefaultConfig):
     # For Twisted and standalone server, the default will automatically work.
     # For others, you should make a matching server config (e.g. an Apache
     # Alias definition pointing to the directory with the static stuff).
-    url_prefix_static = '/wipistatic'
+    url_prefix_static = '/wipi/static'
 
 
     # Security ----------------------------------------------------------
@@ -122,6 +119,12 @@ class FarmConfig(DefaultConfig):
     # 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
+    acl_rights_default = u""
+    acl_rights_before = u"Known:read,write,delete,revert,admin"
 
     # Mail --------------------------------------------------------------
 
@@ -193,14 +196,14 @@ class FarmConfig(DefaultConfig):
     # Authentication
     from auth.mysql_login import mysql_login # This comes from plugin
     from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname
-    from MoinMoin.auth import moin_session
     phpbb = mysql_login(
+        name    = 'phpbb',
         verbose = True,
         dbhost  = phpbb_dbhost,
         dbuser  = phpbb_dbuser,
         dbpass  = phpbb_dbpass,
         dbname  = phpbb_dbname,
     )
-    auth = [phpbb, moin_session]
+    auth = [phpbb]
 
     user_autocreate = True