changeset 173:92e3a82bfe3e

updated sample configs, CHANGES, version imported from: moin--main--1.5--patch-175
author Thomas Waldmann <tw@waldmann-edv.de>
date Mon, 31 Oct 2005 16:43:18 +0000
parents c22b53fb1796
children 51bde0757167
files MoinMoin/version.py docs/CHANGES moin.spec wiki/config/farmconfig.py wiki/config/wikiconfig.py
diffstat 5 files changed, 48 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/version.py	Mon Oct 31 07:38:56 2005 +0000
+++ b/MoinMoin/version.py	Mon Oct 31 16:43:18 2005 +0000
@@ -3,7 +3,7 @@
 """
     MoinMoin - Version Information
 
-    @copyright: 2000-2004 by Jürgen Hermann <jh@web.de>
+    @copyright: 2000-2005 by Jürgen Hermann <jh@web.de>
     @license: GNU GPL, see COPYING for details.
 """
 
@@ -13,7 +13,7 @@
     patchlevel = 'release'
 
 project = "MoinMoin"
-release  = '1.5.0 alpha'
+release  = '1.5.0beta0'
 revision = patchlevel
 
 if __name__ == '__main__':
--- a/docs/CHANGES	Mon Oct 31 07:38:56 2005 +0000
+++ b/docs/CHANGES	Mon Oct 31 16:43:18 2005 +0000
@@ -82,9 +82,8 @@
      * Added sslclientcert auth method (Apache: untested, Twisted: not
        implemented, IIS: no idea). See MoinMoin/auth.py for details.
        Submit a patch if you have improvements.
-     * cfg.superuser is a list of unicode usernames. Currently it is not used
-       by anything, but it will be used e.g. to enable software installation
-       via the wiki.
+     * cfg.superuser is a list of unicode usernames. It is used by some
+       critical operations like despam action or PackageInstaller.
      * removed allowed_actions, we now use actions_excluded only and it
        defaults to [], that means, no action is excluded, everything is
        allowed (limited by ACLs). In case of RenamePage and DeletePage,
@@ -140,7 +139,9 @@
        there first.
 
   Other changes/new features:
-    * Added PackageInstaller and unzipping support (see HelpOnActions/AttachFile for further details). 
+    * Added PackageInstaller and unzipping support (see wiki page
+      HelpOnActions/AttachFile for further details).  PackageInstaller requires
+      the user to be in cfg.superuser list.
      * Added an PackagePages action to simplify the package creation.
     * Added location breadcrumbs - when you are on some subpage, the page
       title parts link to the corresponding parent pages, the last part does
--- a/moin.spec	Mon Oct 31 07:38:56 2005 +0000
+++ b/moin.spec	Mon Oct 31 16:43:18 2005 +0000
@@ -1,6 +1,6 @@
 %define name moin
 %define version 1.5.0
-%define release 0.1.alpha0
+%define release 0.2.beta0
 #Upgrade Path Example:
 #     moin-1.3-0.1.beta1
 #         Patched
--- a/wiki/config/farmconfig.py	Mon Oct 31 07:38:56 2005 +0000
+++ b/wiki/config/farmconfig.py	Mon Oct 31 16:43:18 2005 +0000
@@ -33,6 +33,16 @@
 # 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 = [
     # wikiname,     url regular expression (no protocol)
     # Standalone server needs the port e.g. localhost:8000
@@ -87,6 +97,10 @@
 
     # 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]
@@ -121,8 +135,8 @@
     # page names for system and help pages, those will be used automatically
     # according to the user selected language. [Unicode]
     navi_bar = [
-        # Will use page_front_page, (default FrontPage)
-        u'%(page_front_page)s',
+        # If you want to show your page_front_page here:
+        #u'%(page_front_page)s',
         u'RecentChanges',
         u'FindPage',
         u'HelpContents',
@@ -150,8 +164,12 @@
     # Content options ---------------------------------------------------
 
     # Show users hostnames in RecentChanges
-    show_hosts = 1                  
+    show_hosts = 1
 
-    # Charts size, require gdchart (Set to None to disable).
-    chart_options = {'width': 600, 'height': 300}
+    # 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
+    
+    # Enable graphical charts, requires gdchart.
+    #chart_options = {'width': 600, 'height': 300}
 
--- a/wiki/config/wikiconfig.py	Mon Oct 31 07:38:56 2005 +0000
+++ b/wiki/config/wikiconfig.py	Mon Oct 31 16:43:18 2005 +0000
@@ -35,6 +35,10 @@
     # 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.
+    #logo_string = u'<img src="/wiki/mywiki.png" alt="My Wiki">'
+
     # name of entry page / front page [Unicode], choose one of those:
     
     # a) if most wiki content is in a single language
@@ -43,14 +47,9 @@
     # b) if wiki content is maintained in many languages
     #page_front_page = u"FrontPage"
 
-    # Wiki logo. You can use an image, text or both. [Unicode]
-    # Example: u'<img src="/wiki/mywiki.png" alt="My Wiki">My Wiki'
-    # For no logo or text, use ''
-    logo_string = sitename
-
     # The interwiki name used in interwiki links
     interwikiname = None
-
+    
 
     # Critical setup  ---------------------------------------------------
 
@@ -78,6 +77,10 @@
 
     # 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]
@@ -112,8 +115,8 @@
     # page names for system and help pages, those will be used automatically
     # according to the user selected language. [Unicode]
     navi_bar = [
-        # Will use page_front_page, (default FrontPage)
-        u'%(page_front_page)s',
+        # If you want to show your page_front_page here:
+        #u'%(page_front_page)s',
         u'RecentChanges',
         u'FindPage',
         u'HelpContents',
@@ -143,7 +146,10 @@
     # Show users hostnames in RecentChanges
     show_hosts = 1                  
 
-    # Charts size, require gdchart (Set to None to disable).
-    chart_options = {'width': 600, 'height': 300}   
+    # 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
+    
+    # Enable graphical charts, requires gdchart.
+    #chart_options = {'width': 600, 'height': 300}
 
-