From c4d225ed501195bd1c758fb05475f9291db44ca6 Mon Sep 17 00:00:00 2001 From: Ai Austin Date: Tue, 8 Sep 2015 21:53:49 +0100 Subject: [PATCH] Corrections to ini example files for standalones v2 Remove "currently unused" indicators for some parameters and add missing "DestinationGuide" parameter in [GridServiceInfo] in StandaloneCommon.ini.example as they do work for a standalone. Regularize example URLs for externally provided web page and economy helper information for uniformity. Correct mistake in reference to grid wide DestinationGuide in override capability in OpenSim.ini.example. Signed-off-by: Michael Cerquoni --- bin/OpenSim.ini.example | 17 ++++++++--------- bin/Robust.HG.ini.example | 6 +++--- bin/Robust.ini.example | 6 +++--- bin/config-include/StandaloneCommon.ini.example | 14 ++++++-------- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index f5268bdb10..d395efe7dd 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -610,17 +610,16 @@ [SimulatorFeatures] ;# {SearchServerURI} {} {URL of the search server} {} - ;; This is identical to the Robust LoginService SearchURL setting - ;; and will override that value if set here. The Robust setting - ;; provides a working default for the grid and setting here is - ;; optional. + ;; Optional. If given this serves the same purpose as the grid wide + ;; [LoginServices] SearchURL setting and will override that where + ;; supported by viewers. ;SearchServerURI = "http://127.0.0.1:9000/" + ;# {DestinationGuideURI} {} {URL of the destination guide} {} - ;; - ;; This serves the same purpose as the DestinationGuideURI in the - ;; LoginService setting in the Robust server. This will override - ;; the Robust setting if desired as an option. - ;DestinationGuideURI = "http://127.0.0.1:9000/" + ;; Optional. If given this serves the same purpose as the grid wide + ;; [LoginServices] DestinationGuide setting and will override that where + ;; supported by viewers. + ;DestinationGuideURI = "http://127.0.0.1:9000/guide" [Chat] diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 82eaf1ffa8..6af444c482 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -551,12 +551,12 @@ ; this as splash page ;welcome = ${Const|BaseURL}/welcome - ; helper uri: optional: if it exists if will be used to tell the client to use + ; helper uri: optional: if it exists it will be used to tell the client to use ; this for all economy related things - ;economy = ${Const|BaseURL}:${Const|PublicPort}/ + ;economy = ${Const|BaseURL}/economy ; web page of grid: optional: page providing further information about your grid - ;about = ${Const|BaseURL}/about/ + ;about = ${Const|BaseURL}/about ; account creation: optional: page providing further information about obtaining ; a user account on your grid diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 8d6496db6a..099d4da247 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -538,12 +538,12 @@ ; this as splash page ;welcome = ${Const|BaseURL}/welcome - ; helper uri: optional: if it exists if will be used to tell the client to use + ; helper uri: optional: if it exists it will be used to tell the client to use ; this for all economy related things - ;economy = ${Const|BaseURL}:${Const|PublicPort}/ + ;economy = ${Const|BaseURL}/economy ; web page of grid: optional: page providing further information about your grid - ;about = ${Const|BaseURL}/about/ + ;about = ${Const|BaseURL}/about ; account creation: optional: page providing further information about obtaining ; a user account on your grid diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 76d7a9953c..d0b152c6b6 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -134,6 +134,9 @@ ; Url to search service ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}"; + ; For V3 destination guide + ; DestinationGuide = "${Const|BaseURL}/guide" + ; The minimum user level required for a user to be able to login. 0 by default ; If you disable a particular user's account then you can set their login level below this number. ; You can also change this level from the console though these changes will not be persisted. @@ -222,26 +225,21 @@ ; information on a standalone ;welcome = ${Const|BaseURL}/welcome - ; helper uri: optional: if it exists if will be used to tell the client to use + ; helper uri: optional: if it exists it will be used to tell the client to use ; this for all economy related things - ; currently unused - ;economy = ${Const|BaseURL}:${Const|PublicPort}/ + ;economy = ${Const|BaseURL}/economy ; web page of grid: optional: page providing further information about your grid - ; currently unused - ;about = ${Const|BaseURL}/about/ + ;about = ${Const|BaseURL}/about ; account creation: optional: page providing further information about obtaining ; a user account on your grid - ; currently unused ;register = ${Const|BaseURL}/register ; help: optional: page providing further assistance for users of your grid - ; currently unused ;help = ${Const|BaseURL}/help ; password help: optional: page providing password assistance for users of your grid - ; currently unused ;password = ${Const|BaseURL}/password ; HG address of the gatekeeper, if you have one