Skip to content

Commit

Permalink
Item14530: Keys of a reference are experimental.
Browse files Browse the repository at this point in the history
Also, hide the detailed directories.  Less clutter.
  • Loading branch information
gac410 committed Dec 12, 2017
1 parent 2cf7b18 commit 0b07b1c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
18 changes: 10 additions & 8 deletions core/lib/Foswiki.spec
Original file line number Diff line number Diff line change
Expand Up @@ -130,45 +130,47 @@ $Foswiki::cfg{PermittedRedirectHostUrls} = '';
# *SCRIPTHASH*

# ---++ File System Paths
# Configure the file system locations of key Foswiki directories here. These are usually guessed
# Configure the file system locations of key Foswiki directories here (Display expert parameters to
# see the detailed paths). These are all usually guessed
# correctly during bootstrap. Other file locations are configured within their related sections.
# There are also Wizards available to check the access permissions of each directory and its contents.

# **PATH LABEL="Root Directory" FEEDBACK="icon='ui-icon-check';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,'*'" **
# This is the root file system path where all Foswiki directories should be placed.
# $Foswiki::cfg{RootDir} = '/home/httpd/foswiki';

# **PATH LABEL="Script Directory" FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions';title='Validate file permissions.'" CHECK="noemptyok perms:Dx,'(.txt|.cfg)$'" **
# **PATH LABEL="Script Directory" EXPERT FEEDBACK="icon='ui-icon-check';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} = '$Foswiki::cfg{RootDir}/bin';

# **PATH LABEL="Pub Directory" FEEDBACK="icon='ui-icon-check';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,'*',wDn,'(,v|,pfv)$'" **
# **PATH LABEL="Pub Directory" EXPERT FEEDBACK="icon='ui-icon-check';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,'*',wDn,'(,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
# normally accessible from the web.
$Foswiki::cfg{PubDir} = '$Foswiki::cfg{RootDir}/pub';

# **PATH LABEL="Data Directory" FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions';title='Validate file permissions. WARNING: this may take a long time on a large system'" CHECK="noemptyok perms:rwDnpd,'(,v|,pfv)$',r" **
# **PATH LABEL="Data Directory" EXPERT FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions';title='Validate file permissions. WARNING: this may take a long time on a large system'" CHECK="noemptyok perms:rwDnpd,'(,v|,pfv)$',r" **
# Topic files store (file path, not URL). For example =/usr/local/foswiki/data=.
# This directory must not be web accessible.
$Foswiki::cfg{DataDir} = '$Foswiki::cfg{RootDir}/data';

# **PATH LABEL="Tools Directory" FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions'" CHECK="noemptyok perms:rD" **
# **PATH LABEL="Tools Directory" EXPERT FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions'" CHECK="noemptyok perms:rD" **
# File path to tools directory. For example =/usr/local/foswiki/tools=.
# This directory must not be web accessible.
$Foswiki::cfg{ToolsDir} = '$Foswiki::cfg{RootDir}/tools';

# **PATH LABEL="Template Directory" FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions'" CHECK="noemptyok perms:rD" **
# **PATH LABEL="Template Directory" EXPERT FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions'" CHECK="noemptyok perms:rD" **
# File path to templates directory. For example =/usr/local/foswiki/templates=.
# This directory must not be web accessible.
$Foswiki::cfg{TemplateDir} = '$Foswiki::cfg{RootDir}/templates';

# **PATH LABEL="Locales Directory" FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions'" CHECK="noemptyok perms:rD" **
# **PATH LABEL="Locales Directory" EXPERT FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions'" CHECK="noemptyok perms:rD" **
# File path to locale directory.
# For example =/usr/local/foswiki/locale=.
# This directory must not be web accessible.
$Foswiki::cfg{LocalesDir} = '$Foswiki::cfg{RootDir}/locale';

# **PATH LABEL="Working Directory" ONSAVE FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions'" CHECK="noemptyok perms:rw,'[\//]README$',r" **
# **PATH LABEL="Working Directory" EXPERT ONSAVE FEEDBACK="icon='ui-icon-check';label='Validate Permissions'; method='validate_permissions'" CHECK="noemptyok perms:rw,'[\//]README$',r" **
# Directory where Foswiki stores files that are required for the management
# of Foswiki, but are not required to be accessed from the web.
# A number of subdirectories will be created automatically under this
Expand Down
2 changes: 1 addition & 1 deletion core/lib/Foswiki/Configure/Query.pm
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ sub getspec {
%Foswiki::cfg = %$upper_cfg;

# Reset all bootstrap subdirs to be relative to RootDir
foreach my $bsdir ( keys $Foswiki::cfg{BOOTSTRAPDIRS} ) {
foreach my $bsdir ( keys %{ $Foswiki::cfg{BOOTSTRAPDIRS} } ) {
eval
"\$Foswiki::cfg$bsdir = \$Foswiki::cfg{BOOTSTRAPDIRS}->{'$bsdir'}";
}
Expand Down

0 comments on commit 0b07b1c

Please sign in to comment.