projects
/
matthijs
/
projects
/
wipi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update data_dir_root to the drsnuggles setup.
[matthijs/projects/wipi.git]
/
conf
/
farmconfig.py
diff --git
a/conf/farmconfig.py
b/conf/farmconfig.py
index 36ad4943bff48466dd3f344f767f0082e8e09c61..a1e98ebceef59166777f9ab0a4b2321d846b3dd6 100644
(file)
--- a/
conf/farmconfig.py
+++ b/
conf/farmconfig.py
@@
-46,10
+46,7
@@
wikis = [
# wikiname, url regular expression (no protocol)
# ---------------------------------------------------------------
("exodus", r"exodus.evolution-events.nl/wipi"),
# 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/.*$"),
+ ("extinction", r"extinction.evolution-events.nl/wipi"),
]
]
@@
-73,7
+70,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
# 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):
class FarmConfig(DefaultConfig):
@@
-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).
# 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 ----------------------------------------------------------
# Security ----------------------------------------------------------
@@
-126,7
+123,8
@@
class FarmConfig(DefaultConfig):
acl_hierarchic = True
# Give users all rights, but don't give any rights to anonymous users
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 --------------------------------------------------------------
# Mail --------------------------------------------------------------
@@
-198,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
# 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(
phpbb = mysql_login(
+ name = 'phpbb',
verbose = True,
dbhost = phpbb_dbhost,
dbuser = phpbb_dbuser,
dbpass = phpbb_dbpass,
dbname = phpbb_dbname,
)
verbose = True,
dbhost = phpbb_dbhost,
dbuser = phpbb_dbuser,
dbpass = phpbb_dbpass,
dbname = phpbb_dbname,
)
- auth = [phpbb
, moin_session
]
+ auth = [phpbb]
user_autocreate = True
user_autocreate = True