Skip to content

Commit

Permalink
Item12381: Restructure General settings a bit.
Browse files Browse the repository at this point in the history
Since all the file system paths are now expert,  put them into a
separate tab that can be hidden.

Also put the SCRIPTHASH dynamic settings at the bottom of the URL tab.
These settings are almost never used, and it pushes other settings too
far down when expert is enabled.
  • Loading branch information
gac410 committed Jan 19, 2015
1 parent 360d27e commit 7175c9b
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions core/lib/Foswiki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@
# This is because they *must* be defined in LocalSite.cfg, and *not* here.

#############################################################################
#---+ General path settings
# *Security Note:* Only the URL paths listed should
#---+ General settings
#---++ Web URL and Paths
# *Security Note:* Only the URL paths listed below should
# be browseable from the web - if you expose any other directories (such as
# lib or templates) you are opening up routes for possible hacking attempts.

Expand Down Expand Up @@ -91,10 +92,6 @@ $Foswiki::cfg{PermittedRedirectHostUrls} = '';
# for more information on setting up Foswiki to use shorter script URLs.
# $Foswiki::cfg{ScriptUrlPath} = '/foswiki/bin';

# **PATH LABEL="Script Directory" EXPERT FEEDBACK="label='Validate Permissions'; method='validate_permissions';title='Validate file permissions.'" CHECK="noemptyok perms:Dx,'(.txt|.cfg)$'" **
# This is the file system path used to access the Foswiki bin directory.
# $Foswiki::cfg{ScriptDir} = '/home/httpd/foswiki/bin';

# **STRING 10 LABEL="Script Suffix" CHECK="emptyok"**
# Suffix of Foswiki CGI scripts. For example, .cgi or .pl.
# You may need to set this if your webserver requires an extension.
Expand All @@ -115,9 +112,6 @@ $Foswiki::cfg{PermittedRedirectHostUrls} = '';
# [[http://foswiki.org/Support/ShorterUrlCookbook][Shorter URL Cookbook]]
# $Foswiki::cfg{ScriptUrlPaths}{view} = '$Foswiki::cfg{ScriptUrlPath}/view$Foswiki::cfg{ScriptSuffix}';

#! The following plugin must follow all other {ScriptUrlPaths} items
# *SCRIPTHASH*

# **URLPATH LABEL="Pub Url Path" CHECK='noemptyok notrail' **
# This is the URL path used to link to attachments. For stores where
# attachments are stored as files (such as PlainFile and RCSLite) then this
Expand All @@ -132,6 +126,16 @@ $Foswiki::cfg{PermittedRedirectHostUrls} = '';
# for more information.
# $Foswiki::cfg{PubUrlPath} = '/foswiki/pub';

#! The following plugin must follow all other {ScriptUrlPaths} items
# *SCRIPTHASH*

# ---++ File System Paths
# Configure the file system locations of key Foswiki directories here. These are usually guessed
# correctly during bootstrap. Other file locations are configured within their related sections.
# **PATH LABEL="Script Directory" EXPERT FEEDBACK="label='Validate Permissions'; method='validate_permissions';title='Validate file permissions.'" CHECK="noemptyok perms:Dx,'(.txt|.cfg)$'" **
# This is the file system path used to access the Foswiki bin directory.
# $Foswiki::cfg{ScriptDir} = '/home/httpd/foswiki/bin';

# **PATH LABEL="Pub Directory" EXPERT FEEDBACK="label='Validate Permissions'; method='validate_permissions';title='Validate file permissions. WARNING: this may take a long time on a large system'" CHECK="noemptyok perms:r,'*',wD,'(,v|,pfv)$'" **
# Attachments store (file path, not URL), must match the attachments URL
# path =/foswiki/pub= - for example =/usr/local/foswiki/pub= This directory is
Expand Down

0 comments on commit 7175c9b

Please sign in to comment.