changeset 3478:242d882d9ba4

reorganized the configuration samples into config snippets, reducing redundancy, add README about how to use wikiconfig snippets
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 05 Apr 2008 18:26:33 +0200
parents b5785334d181
children 6e453ec5d42f
files wiki/config/mailimportconf.py wiki/config/more_samples/README wiki/config/more_samples/jabber_wikiconfig.py wiki/config/more_samples/jabber_wikiconfig_snippet.py wiki/config/more_samples/ldap_smb_farmconfig.py wiki/config/more_samples/ldap_wikiconfig_snippet.py wiki/config/more_samples/mailimportconf.py wiki/config/more_samples/smb_wikiconfig_snippet.py
diffstat 8 files changed, 119 insertions(+), 448 deletions(-) [+]
line wrap: on
line diff
--- a/wiki/config/mailimportconf.py	Sat Apr 05 16:57:50 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-# This is the configuration file for the mail import client
-
-# This secret has to be known by the wiki server
-mail_import_secret = u"foo"
-
-# The target wiki URL
-mail_import_url = u"http://localhost/?action=xmlrpc2"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/config/more_samples/README	Sat Apr 05 18:26:33 2008 +0200
@@ -0,0 +1,24 @@
+Here are some more configuration examples you might find useful.
+
+If the file is called *_snippet*, it means that it is NOT a complete config
+file, but just a part you can use for assembling one yourself).
+
+wikiconfig snippet usage
+========================
+
+Except otherwise noted, you will have to copy the content of the snippet file
+INTO your wiki configuration class.
+
+That means:
+
+a) For a single wiki:
+   Below the "class Config(DefaultConfig):" line in wikiconfig.py.
+
+b) For a wiki farm, if the configuration should be common for all wikis ini
+   the farm:
+   Below the "class FarmConfig(DefaultConfig):" line in farmconfig.py.
+
+c) For a wiki farm, if the configuration should be just for some single,
+   individual wiki in the farm:
+   Below the "class Config(FarmConfig):" line in <yourwikiname>.py.
+
--- a/wiki/config/more_samples/jabber_wikiconfig.py	Sat Apr 05 16:57:50 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-# -*- 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.
-
-"""
-    MoinMoin - Configuration for a single wiki
-
-    This is a sample configuration for a wiki which uses a Jabber
-    notification bot. Note that the bot has to be started separately
-    (as of the time of writing this) and has its own configuration. Make
-    sure that a shared secret is set to the same (long) string in both
-    configs! The notification bot specific options are at the bottom.
-
-    If you run a single wiki only, you can omit the farmconfig.py config
-    file and just use wikiconfig.py - it will be used for every request
-    we get in that case.
-
-    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
-    default values.
-
-    Also, the URL http://moinmo.in/HelpOnConfiguration has
-    a list of config options.
-
-    ** Please do not use this file for a wiki farm. Use the sample file
-    from the wikifarm directory instead! **
-"""
-
-from MoinMoin.config.multiconfig import DefaultConfig
-
-
-class Config(DefaultConfig):
-
-    # Wiki identity ----------------------------------------------------
-
-    # Site name, used by default for wiki name-logo [Unicode]
-    sitename = u'Untitled Wiki'
-
-    # Wiki logo. You can use an image, text or both. [Unicode]
-    # For no logo or text, use '' - the default is to show the sitename.
-    # See also url_prefix setting below!
-    logo_string = u'<img src="/wiki/common/moinmoin.png" alt="MoinMoin Logo">'
-
-    # name of entry page / front page [Unicode], choose one of those:
-
-    # a) if most wiki content is in a single language
-    #page_front_page = u"MyStartingPage"
-
-    # b) if wiki content is maintained in many languages
-    #page_front_page = u"FrontPage"
-
-    # The interwiki name used in interwiki links
-    #interwikiname = 'UntitledWiki'
-    # Show the interwiki name (and link it to page_front_page) in the Theme,
-    # nice for farm setups or when your logo does not show the wiki's name.
-    #show_interwiki = 1
-
-
-    # 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/'
-
-    # 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
-    # directory is part of MoinMoin distribution, you don't have to
-    # backup it.
-    data_underlay_dir = './underlay/'
-
-    # 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_static160' for moin
-    # version 1.6.0).
-    # 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 = '/moin_static160'
-
-
-    # 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
-
-
-    # Mail --------------------------------------------------------------
-
-    # Configure to enable subscribing to pages (disabled by default)
-    # or sending forgotten passwords.
-
-    # SMTP server, e.g. "mail.provider.com" (None to disable mail)
-    #mail_smarthost = ""
-
-    # The return address, e.g u"Jürgen Wiki <noreply@mywiki.org>" [Unicode]
-    #mail_from = u""
-
-    # "user pwd" if you need to use SMTP AUTH
-    #mail_login = ""
-
-
-    # User interface ----------------------------------------------------
-
-    # Add your wikis important pages at the end. It is not recommended to
-    # remove the default links.  Leave room for user links - don't use
-    # more than 6 short items.
-    # You MUST use Unicode strings here, but you need not use localized
-    # 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'
-
-
-    # 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'
-
-    # You must use Unicode strings here [Unicode]
-    page_category_regex = u'^Category[A-Z]'
-    page_dict_regex = u'[a-z]Dict$'
-    page_form_regex = u'[a-z]Form$'
-    page_group_regex = u'[a-z]Group$'
-    page_template_regex = u'[a-z]Template$'
-
-    # Content options ---------------------------------------------------
-
-    # Show users hostnames in RecentChanges
-    show_hosts = 1
-
-    # Enable graphical charts, requires gdchart.
-    #chart_options = {'width': 600, 'height': 300}
-
-    # Notification bot options ------------------------------------------
-
-    # Host and port on which the notification bot runs
-    notification_bot_uri = u"http://localhost:8000"
-
-    # A secret shared with notification bot, must be the same in both
-    # configs for communication to work.
-    #
-    # CHANGE IT TO A LONG RANDOM STRING, OR YOU WILL HAVE A SECURITY ISSUE!
-    secret = u""
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/config/more_samples/jabber_wikiconfig_snippet.py	Sat Apr 05 18:26:33 2008 +0200
@@ -0,0 +1,12 @@
+    # This is a sample configuration snippet for a wiki which uses a Jabber
+    # notification bot.
+    # Note that the bot has to be started separately and has its own configuration.
+
+    # Host and port on which the notification bot runs
+    notification_bot_uri = u"http://localhost:8000"
+
+    # A secret shared with notification bot, must be the same in both configs
+    # (the wiki config and the notification bot config) for communication to work.
+    # CHANGE IT TO A LONG RANDOM STRING, OR YOU WILL HAVE A SECURITY ISSUE!
+    secret = u""
+
--- a/wiki/config/more_samples/ldap_smb_farmconfig.py	Sat Apr 05 16:57:50 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
-# -*- 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.
-
-"""
-    MoinMoin - Configuration for a wiki farm
-
-    This is a sample configuration for a farm using ldap and smb auth plugins.
-
-    !!! NEEDS UPDATE FOR MOIN 1.7 !!!
-
-    It works like this:
-    * user logs in via moin's form on UserPreferences
-    * ldap_login plugin checks username/password against LDAP
-      * if username/password is ok for LDAP, the plugin creates a user profile
-        with up-to-date settings from ldap (name, alias, email and crypted
-        password) and just hands over to the next auth plugin...
-      * if username/password is not ok for LDAP, it does not store/update
-        a user profile, but also hands over to the next auth plugin.
-    * smb_mount plugin also gets username/password and uses it to mount another
-      server's share on some mountpoint (using access rights of username,
-      authenticating using password) on the wiki server (very special use only -
-      if you don't need it, don't use it).
-    * moin_cookie finally gets username/password and uses it to load the
-      user's profile, set a cookie for subsequent requests and return a user
-      object.
-
-"""
-
-# Wikis in your farm --------------------------------------------------
-
-# If you run multiple wikis, you need this list of pairs (wikiname, url
-# regular expression). moin processes that list and tries to match the
-# regular expression against the URL of this request - until it matches.
-# Then it loads the <wikiname>.py config for handling that request.
-
-# Important:
-#  * the left part is the wikiname enclosed in double quotes
-#  * the left part must be a valid python module name, so better use only
-#    lower letters "a-z" and "_". Do not use blanks or "-" there!!!
-#  * the right part is the url re, use r"..." for it
-#  * the right part does NOT include "http://" nor "https://" at the beginning
-#  * in the right part ".*" means "everything". Just "*" does not work like
-#    for filenames on the shell / commandline, you must use ".*" as it is a RE.
-#  * in the right part, "^" means "beginning" and "$" means "end"
-
-wikis = [
-    # Standalone server needs the port e.g. localhost:8000
-    # Twisted server can now use the port, too.
-
-    # wikiname,     url regular expression (no protocol)
-    # ---------------------------------------------------------------
-    ("info1", r"^info1.example.org/.*$"),
-    ("info2", r"^info2.example.org/.*$"),
-]
-
-
-# Common configuration for all wikis ----------------------------------
-
-# Everything that should be configured the same way should go here,
-# anything else that should be different should go to the single wiki's
-# config.
-# In that single wiki's config, we will use the class FarmConfig we define
-# below as the base config settings and only override what's different.
-#
-# In exactly the same way, we first include MoinMoin's Config Defaults here -
-# this is to get everything to sane defaults, so we need to change only what
-# we like to have different:
-
-from MoinMoin.config.multiconfig import DefaultConfig
-
-# Now we subclass this DefaultConfig. This means that we inherit every setting
-# from the DefaultConfig, except those we explicitely define different.
-
-class FarmConfig(DefaultConfig):
-
-    from MoinMoin import auth as authmod
-    auth = [authmod.ldap_login, authmod.smb_mount, authmod.moin_session]
-
-    import ldap
-    ldap_uri = 'ldap://ad.example.org' # ldap / active directory server URI
-
-    # We can either use some fixed user and password for binding to LDAP.
-    # Be careful if you need a % char in those strings - as they are used as
-    # a format string, you have to write %% to get a single % in the end.
-    #ldap_binddn = 'binduser@example.org'
-    #ldap_bindpw = 'secret'
-
-    #or we can use the username and password we got from the user:
-    ldap_binddn = '%(username)s@example.org' # DN we use for first bind (AD)
-    #ldap_binddn = 'cn=admin,dc=example,dc=org' # DN we use for first bind (OpenLDAP)
-    ldap_bindpw = '%(password)s' # password we use for first bind
-
-    ldap_base = 'ou=SOMEUNIT,dc=example,dc=org' # base DN we use for searching
-    ldap_scope = ldap.SCOPE_SUBTREE # scope of the search we do
-    ldap_filter = '(sAMAccountName=%(username)s)' # ldap filter used for searching
-    # you can also do more complex filtering like:
-    # "(&(cn=%(username)s)(memberOf=CN=WikiUsers,OU=Groups,DC=example,DC=org))"
-    ldap_givenname_attribute = 'givenName' # ldap attribute we get the first name from
-    ldap_surname_attribute = 'sn' # ldap attribute we get the family name from
-    ldap_aliasname_attribute = 'displayName' # ldap attribute we get the aliasname from
-    ldap_email_attribute = 'mail' # ldap attribute we get the email address from
-    ldap_coding = 'utf-8' # coding used for ldap queries and result values
-    ldap_timeout = 10 # how long we wait for the ldap server [s]
-    ldap_verbose = True # if True, put lots of LDAP debug info into the log
-    ldap_bindonce = False # set to True to only do one bind.  Useful if
-                          # configured to bind as the user on the first attempt
-    cookie_lifetime = 1 # 1 hour after last access ldap login is required again
-    user_autocreate = True
-
-    smb_server = "smb.example.org" # smb server name
-    smb_domain = 'DOMAIN' # smb domain name
-    smb_share = 'FILESHARE' # smb share we mount
-    smb_mountpoint = u'/mnt/wiki/%(username)s' # where we mount the smb filesystem
-    smb_display_prefix = u"S:" # where //server/share is usually mounted for your windows users (display purposes only)
-    smb_dir_user = "wwwrun" # owner of the mounted directories
-    smb_dir_mode = "0700" # mode of the mounted directories
-    smb_file_mode = "0600" # mode of the mounted files
-    smb_iocharset = "iso8859-1" # "UTF-8" > cannot access needed shared library!
-    smb_coding = 'iso8859-1' # coding used for encoding the commandline for the mount command
-    smb_verbose = True # if True, put SMB debug info into log
-    smb_log = "/dev/null" # where we redirect mount command output to
-
-    # customize UserPreferences (optional)
-    user_checkbox_remove = [
-        'disabled', 'remember_me', 'edit_on_doubleclick', 'show_nonexist_qm',
-        'show_toolbar', 'show_topbottom', 'show_fancy_diff',
-        'wikiname_add_spaces', ]
-    user_checkbox_defaults = {'mailto_author':       0,
-                              'edit_on_doubleclick': 0,
-                              'remember_last_visit': 0,
-                              'show_nonexist_qm':    0,
-                              'show_page_trail':     1,
-                              'show_toolbar':        1,
-                              'show_topbottom':      0,
-                              'show_fancy_diff':     1,
-                              'wikiname_add_spaces': 0,
-                              'remember_me':         0,
-                              'want_trivial':        0,
-                             }
-    user_form_defaults = {
-        # key: default
-        'name': '',
-        'aliasname': '',
-        'password': '',
-        'password2': '',
-        'email': '',
-        'css_url': '',
-        'edit_rows': "20",
-    }
-    user_form_disable = ['name', 'aliasname', 'email', ]
-    user_form_remove = ['password', 'password2', 'css_url', 'logout', 'create', 'account_sendmail', ]
-
-    # 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/'
-
-    # 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
-    # directory is part of MoinMoin distribution, you don't have to
-    # backup it.
-    data_underlay_dir = './underlay/'
-
-    # This must be '/wiki' for twisted and standalone. For CGI, it should
-    # match your Apache Alias setting.
-    url_prefix = '/wiki'
-
-
-    # Security ----------------------------------------------------------
-
-    # This is checked by some rather critical and potentially harmful actions,
-    # like despam or PackageInstaller action:
-    #superuser = [u"AdminName", ]
-
-    # 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"AdminGroup:admin,read,write,delete,revert"
-    acl_rights_default = u"EditorGroup:read,write.delete,revert ViewerGroup:read All:"
-
-    # Link spam protection for public wikis (uncomment to enable).
-    # Needs a reliable internet connection.
-    from MoinMoin.security.autoadmin import SecurityPolicy
-
-
-    # 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 = "mail.example.org"
-
-    # The return address, e.g u"Jürgen Wiki <noreply@mywiki.org>" [Unicode]
-    mail_from = u"wiki@example.org"
-
-    # "user pwd" if you need to use SMTP AUTH
-    mail_login = ""
-
-
-    # User interface ----------------------------------------------------
-
-    # Add your wikis important pages at the end. It is not recommended to
-    # remove the default links.  Leave room for user links - don't use
-    # more than 6 short items.
-    # You MUST use Unicode strings here, but you need not use localized
-    # 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'
-
-
-    # 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 = 'de'
-
-    # You must use Unicode strings here [Unicode]
-    page_category_regex = u'^Category[A-Z]'
-    page_dict_regex = u'[a-z]Dict$'
-    page_group_regex = u'[a-z]Group$'
-    page_template_regex = u'[a-z]Template$'
-
-    # Content options ---------------------------------------------------
-
-    # Show users hostnames in RecentChanges
-    show_hosts = 1
-
-    # Show the interwiki name (and link it to page_front_page) in the Theme,
-    # nice for farm setups or when your logo does not show the wiki's name.
-    show_interwiki = 1
-    logo_string = u''
-
-    # Enable graphical charts, requires gdchart.
-    #chart_options = {'width': 600, 'height': 300}
-
-    # interwiki map
-    #shared_intermap = ["/opt/moinfarm/common/intermap.txt", ]
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/config/more_samples/ldap_wikiconfig_snippet.py	Sat Apr 05 18:26:33 2008 +0200
@@ -0,0 +1,60 @@
+    # This is a sample configuration snippet that shows how to use the ldap auth plugin.
+    # See HelpOnAuthentication and HelpOnConfiguration for more infos.
+
+    from MoinMoin.auth.ldap_login import LDAPAuth
+    ldap_authenticator1 = LDAPAuth(
+        # the values shown below are the DEFAULT values (you may remove them if you are happy with them),
+        # the examples shown in the comments are typical for Active Directory (AD) or OpenLDAP.
+        server_uri='ldap://localhost',  # ldap / active directory server URI
+                                        # use ldaps://server:636 url for ldaps,
+                                        # use  ldap://server for ldap without tls (and set start_tls to 0),
+                                        # use  ldap://server for ldap with tls (and set start_tls to 1 or 2).
+        bind_dn='',  # We can either use some fixed user and password for binding to LDAP.
+                     # Be careful if you need a % char in those strings - as they are used as
+                     # a format string, you have to write %% to get a single % in the end.
+                     #bind_dn = 'binduser@example.org' # (AD)
+                     #bind_dn = 'cn=admin,dc=example,dc=org' # (OpenLDAP)
+                     #bind_pw = 'secret'
+                     # or we can use the username and password we got from the user:
+                     #bind_dn = '%(username)s@example.org' # DN we use for first bind (AD)
+                     #bind_pw = '%(password)s' # password we use for first bind
+                     # or we can bind anonymously (if that is supported by your directory).
+                     # In any case, bind_dn and bind_pw must be defined.
+        bind_pw='',
+        base_dn='',  # base DN we use for searching
+                     #base_dn = 'ou=SOMEUNIT,dc=example,dc=org'
+        scope=2, # scope of the search we do (2 == ldap.SCOPE_SUBTREE)
+        referrals=0, # LDAP REFERRALS (0 needed for AD)
+        search_filter='(uid=%(username)s)',  # ldap filter used for searching:
+                                             #search_filter = '(sAMAccountName=%(username)s)' # (AD)
+                                             #search_filter = '(uid=%(username)s)' # (OpenLDAP)
+                                             # you can also do more complex filtering like:
+                                             # "(&(cn=%(username)s)(memberOf=CN=WikiUsers,OU=Groups,DC=example,DC=org))"
+        # some attribute names we use to extract information from LDAP (if not None,
+        # if None, the attribute won't be extracted from LDAP):
+        givenname_attribute=None, # often 'givenName' - ldap attribute we get the first name from
+        surname_attribute=None, # often 'sn' - ldap attribute we get the family name from
+        aliasname_attribute=None, # often 'displayName' - ldap attribute we get the aliasname from
+        email_attribute=None, # often 'mail' - ldap attribute we get the email address from
+        email_callback=None, # callback function called to make up email address
+        coding='utf-8', # coding used for ldap queries and result values
+        timeout=10, # how long we wait for the ldap server [s]
+        start_tls=0, # usage of Transport Layer Security 0 = No, 1 = Try, 2 = Required
+        tls_cacertdir='',
+        tls_cacertfile='',
+        tls_certfile='',
+        tls_keyfile='',
+        tls_require_cert=0, # 0 == ldap.OPT_X_TLS_NEVER (needed for self-signed certs)
+        bind_once=False, # set to True to only do one bind - useful if configured to bind as the user on the first attempt
+    )
+
+    auth = [ldap_authenticator1, ] # this is a list, you may have multiple ldap authenticators
+                                   # as well as other authenticators
+
+    cookie_lifetime = 1 # 1 hour after last access ldap login is required again
+    user_autocreate = True
+
+    # customize user preferences (optional, see MoinMoin/config/multiconfig for internal defaults)
+    # you maybe want to use user_checkbox_remove, user_checkbox_defaults, user_form_defaults,
+    # user_form_disable, user_form_remove.
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/config/more_samples/mailimportconf.py	Sat Apr 05 18:26:33 2008 +0200
@@ -0,0 +1,8 @@
+# This is the configuration file for the mail import client
+
+# This secret has to be known by the wiki server
+mail_import_secret = u"foo"
+
+# The target wiki URL
+mail_import_url = u"http://localhost/?action=xmlrpc2"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wiki/config/more_samples/smb_wikiconfig_snippet.py	Sat Apr 05 18:26:33 2008 +0200
@@ -0,0 +1,15 @@
+    # TODO: needs to get fixed for 1.7 auth objects
+
+    smb_server = "smb.example.org" # smb server name
+    smb_domain = 'DOMAIN' # smb domain name
+    smb_share = 'FILESHARE' # smb share we mount
+    smb_mountpoint = u'/mnt/wiki/%(username)s' # where we mount the smb filesystem
+    smb_display_prefix = u"S:" # where //server/share is usually mounted for your windows users (display purposes only)
+    smb_dir_user = "wwwrun" # owner of the mounted directories
+    smb_dir_mode = "0700" # mode of the mounted directories
+    smb_file_mode = "0600" # mode of the mounted files
+    smb_iocharset = "iso8859-1" # "UTF-8" > cannot access needed shared library!
+    smb_coding = 'iso8859-1' # coding used for encoding the commandline for the mount command
+    smb_verbose = True # if True, put SMB debug info into log
+    smb_log = "/dev/null" # where we redirect mount command output to
+