X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=ec0e2c57f9093dd56c484afc0bd7d91ff8644e78;hb=e66f6e1418a32ce55d0d22e3bf5929b1ddca9a12;hp=36ad4943bff48466dd3f344f767f0082e8e09c61;hpb=c551e5ac93815a81461dd4fb4e96b94732787033;p=matthijs%2Fprojects%2Fwipi.git

diff --git a/conf/farmconfig.py b/conf/farmconfig.py
index 36ad494..ec0e2c5 100644
--- a/conf/farmconfig.py
+++ b/conf/farmconfig.py
@@ -46,10 +46,14 @@ wikis = [
     # wikiname,     url regular expression (no protocol)
     # ---------------------------------------------------------------
     ("exodus", r"exodus.evolution-events.nl/wipi"),
-
-    # for multiple wikis, do something like this:
-    #("moinmoin",    r"^moinmo.in/.*$"),
-    #("moinmaster",  r"^master.moinmo.in/.*$"),
+    ("exodus", r"exodus-nieuw.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 site in the exodus config,
+    # all links still work too!
+    ("exodus", r"exodus-nieuw.evolution-events.nl"),
+    ("exodus", r"exodus.evolution-events.nl"),
+    ("extinction", r"extinction.evolution-events.nl/wipi"),
 ]
 
 
@@ -73,7 +77,7 @@ from MoinMoin.config.multiconfig import DefaultConfig
 # Local setting, defined by matthijs for easy moving of data. It didn't work
 # to define this in the FarmConfig class, so just put it here..
 import os
-data_dir_root = os.path.join(os.path.dirname(__file__), os.path.pardir, 'data')
+data_dir_root = os.path.join(os.environ['SITE_DIR'], 'data', 'wipi')
 
 class FarmConfig(DefaultConfig):
 
@@ -97,6 +101,11 @@ class FarmConfig(DefaultConfig):
     # backup it.
     data_underlay_dir = data_dir_root + '/underlay/'
 
+    # Override the default data_dir/plugin path for plugins, which doesn't
+    # make sense. We don't want to have per-wiki plugins anyway and stuffing
+    # code in the datadir is weird.
+    plugin_dir = os.path.join(os.path.dirname(__file__), os.path.pardir, 'plugin')
+
     # The URL prefix we use to access the static stuff (img, css, js).
     # NOT touching this is maybe the best way to handle this setting as moin
     # uses a good internal default (something like '/moin_static163' for moin
@@ -104,7 +113,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 ----------------------------------------------------------
@@ -126,7 +135,8 @@ class FarmConfig(DefaultConfig):
     acl_hierarchic = True
 
     # Give users all rights, but don't give any rights to anonymous users
-    acl_rights_default = u"Known:read,write,delete,revert,admin"
+    acl_rights_default = u""
+    acl_rights_before = u"Known:read,write,delete,revert,admin"
 
     # Mail --------------------------------------------------------------
 
@@ -198,14 +208,17 @@ 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,
+        hint    = "Hier kunnen bestuursleden van Evolution Events inloggen om wijzigingen te maken."
     )
-    auth = [phpbb, moin_session]
+    auth = [phpbb]
 
     user_autocreate = True
+    
+# vim: set ts=8 sts=4 sw=4 expandtab: