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 mysql_login to moin 1.8.
[matthijs/projects/wipi.git]
/
conf
/
farmconfig.py
diff --git
a/conf/farmconfig.py
b/conf/farmconfig.py
index f8c657d29563bbaf6f0304c98655daf2f0710814..57175438df8f444aa4447410d140439fd9bb1718 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"),
]
]
@@
-199,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