X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fwipi.git;a=blobdiff_plain;f=conf%2Ffarmconfig.py;h=de72c1ab785b572a1f89ff6d7a5ec46abd78e22a;hp=b4011c71a86e0fb99d78355a4b6677183b902ba1;hb=56c7185a2b300c7db7c4e0cdb0f9a5149e46b595;hpb=a4579debe2c4ad40692bcb3dd9ed135af1a30947 diff --git a/conf/farmconfig.py b/conf/farmconfig.py index b4011c7..de72c1a 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 @@ -45,13 +37,15 @@ wikis = [ # wikiname, url regular expression (no protocol) # --------------------------------------------------------------- - ("extinction", r"extinction.evolution-events.nl/wipi"), - ("exodus", r"exodus.evolution-events.nl/wipi"), + ("extinction", r"http://extinction.evolution-events.nl/wipi"), + ("exodus", r"http://exodus.evolution-events.nl/wipi"), + ("deadfoxjunction", r"http://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"), + ("exodus", r"http://exodus.evolution-events.nl"), + ("deadfoxjunction", r"http://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,39 +99,19 @@ 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 + # Give all rights to the EE group, but no rights to anonymous users. acl_rights_default = u"" - acl_rights_before = u"Known:read,write,delete,revert,admin" + acl_rights_before = u"Evolution Events - Algemeen Bestuur:read,write,delete,revert,admin" # 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 " [Unicode] - #mail_from = u"" - - # "user pwd" if you need to use SMTP AUTH - #mail_login = "" + # Not configured # User interface ---------------------------------------------------- @@ -160,22 +123,18 @@ 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', ] - # The default theme anonymous or new users get - theme_default = 'modern' - + # Always use the proxy. Specific configs define a proxy_theme_mapping, + # which maps specific paths to a corresponding theme. + theme_default = 'proxy' + theme_force = True # 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' @@ -187,6 +146,9 @@ class FarmConfig(DefaultConfig): # Content options --------------------------------------------------- + # name of entry page + page_front_page = u"Start" + # Show users hostnames in RecentChanges show_hosts = 1 @@ -195,27 +157,27 @@ 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 editor_default = 'text' # internal default, just for completeness + # Require a comment on page changes. This needs a patched moinmoin. + require_comment = True # Authentication - from auth.mysql_login import mysql_login # This comes from plugin - from dbsettings import phpbb_dbhost, phpbb_dbuser, phpbb_dbpass, phpbb_dbname - phpbb = mysql_login( + import auth.phpbb + import dbsettings + (phpbb_auth, phpbb_groups) = auth.phpbb.setup( 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." + dbhost = dbsettings.phpbb_dbhost, + dbuser = dbsettings.phpbb_dbuser, + dbpass = dbsettings.phpbb_dbpass, + dbname = dbsettings.phpbb_dbname, + phpbb_prefix = dbsettings.phpbb_prefix, + hint = "Hier kun je inloggen met je Evolution Events Forum account. dit is vooral nuttig voor bestuursleden om wijzigingen te maken." ) - auth = [phpbb] + auth = [phpbb_auth] + groups = phpbb_groups user_autocreate = True