From f96afdb62bc05dd4c2ec4ba53a9978218bd82746 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Fri, 9 Dec 2016 07:16:10 +1000 Subject: Various little clean ups. --- config/Robust.ini.template | 58 +++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'config/Robust.ini.template') diff --git a/config/Robust.ini.template b/config/Robust.ini.template index b7a68a6..4ee1bb3 100644 --- a/config/Robust.ini.template +++ b/config/Robust.ini.template @@ -153,14 +153,14 @@ ;; runs the UserAgentsService, possibly this server. ;; For example http://myworld.com:8002 ;; This is a default that can be overwritten in some sections. - HomeURI = "${Const|BaseURL}:${Const|PublicPort}" + HomeURI = "${Const|GridURL}:${Const|PublicPort}" ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} ;; This is the address of the external robust server ;; that runs the Gatekeeper service, possibly this server. ;; For example http://myworld.com:8002 ;; This is a default that can be overwritten in some sections. - GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" + GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}" [AccessControl] ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {} @@ -306,7 +306,7 @@ ExportSupported = true ;; If you have this set under [Hypergrid], no need to set it here, leave it commented - ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" + ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}" ; * This is the configuration for the freeswitch server in grid mode @@ -470,31 +470,31 @@ AllowRemoteSetLoginLevel = "false" ; For V2 map - MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/"; + MapTileURL = "${Const|GridURL}:${Const|PublicPort}/"; ; Url to search service - ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}/"; + ; SearchURL = "${Const|GridURL}:${Const|PublicPort}/"; ; For V3 destination guide - ; DestinationGuide = "${Const|BaseURL}/guide" + ; DestinationGuide = "${Const|GridURL}/guide" ; For V3 avatar picker (( work in progress )) - ; AvatarPicker = "${Const|BaseURL}/avatars" + ; AvatarPicker = "${Const|GridURL}/avatars" ; If you run this login server behind a proxy, set this to true ; HasProxy = false ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs) ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented - ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" + ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}" - SRV_HomeURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_InventoryServerURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_AssetServerURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_ProfileServerURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_FriendsServerURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_IMServerURI = "${Const|BaseURL}:${Const|PublicPort}" - SRV_GroupsServerURI = "${Const|BaseURL}:${Const|PublicPort}" + SRV_HomeURI = "${Const|GridURL}:${Const|PublicPort}" + SRV_InventoryServerURI = "${Const|GridURL}:${Const|PublicPort}" + SRV_AssetServerURI = "${Const|GridURL}:${Const|PublicPort}" + SRV_ProfileServerURI = "${Const|GridURL}:${Const|PublicPort}" + SRV_FriendsServerURI = "${Const|GridURL}:${Const|PublicPort}" + SRV_IMServerURI = "${Const|GridURL}:${Const|PublicPort}" + SRV_GroupsServerURI = "${Const|GridURL}:${Const|PublicPort}" ;# {DSTZone} {} {Override Daylight Saving Time rules} {* none local} "America/Los_Angeles;Pacific Standard Time" ;; Viewers do not receive timezone information from the server - almost all (?) default to Pacific Standard Time @@ -551,42 +551,42 @@ ; See http://opensimulator.org/wiki/GridInfo ; login uri: for grid this is the login server URI - login = ${Const|BaseURL}:${Const|PublicPort}/ + login = ${Const|GridURL}:${Const|PublicPort}/ ; long grid name: the long name of your grid gridname = "${Const|GridName}" ; short grid name: the short name of your grid - gridnick = "${Const|GridName}" + gridnick = "${Const|ShortGridName}" ; login page: optional: if it exists it will be used to tell the client to use ; this as splash page - ;welcome = ${Const|BaseURL}/welcome + welcome = ${Const|GridURL}/drupal/loginpage ; 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}/economy + ;economy = ${Const|GridURL}/economy ; web page of grid: optional: page providing further information about your grid - ;about = ${Const|BaseURL}/about + about = ${Const|GridURL}/drupal/ ; account creation: optional: page providing further information about obtaining ; a user account on your grid - ;register = ${Const|BaseURL}/register + register = ${Const|GridURL}/drupal/content/How_to_join ; help: optional: page providing further assistance for users of your grid - ;help = ${Const|BaseURL}/help + help = ${Const|GridURL}/drupal/Tags/help ; password help: optional: page providing password assistance for users of your grid - ;password = ${Const|BaseURL}/password + password = ${Const|GridURL}/drupal ; HG address of the gatekeeper, if you have one ; this is the entry point for all the regions of the world - ; gatekeeper = ${Const|BaseURL}:${Const|PublicPort}/ + ; gatekeeper = ${Const|GridURL}:${Const|PublicPort}/ ; HG user domain, if you have one ; this is the entry point for all user-related HG services - ; uas = ${Const|BaseURL}:${Const|PublicPort}/ + ; uas = ${Const|GridURL}:${Const|PublicPort}/ [GatekeeperService] @@ -601,7 +601,7 @@ SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector" ; how does the outside world reach me? This acts as public key too. ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented - ; ExternalName = "${Const|BaseURL}:${Const|PublicPort}" + ; ExternalName = "${Const|GridURL}:${Const|PublicPort}" ; Does this grid allow incoming links to any region in it? ; If false, HG TPs happen only to the Default regions specified in [GridService] section @@ -691,7 +691,7 @@ AuthType = None ;; Can overwrite the default in [Hypergrid], but probably shouldn't - ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" + ; HomeURI = "${Const|GridURL}:${Const|PublicPort}" ; * The interface that local users get when they are in other grids. @@ -710,7 +710,7 @@ AuthType = None ;; Can overwrite the default in [Hypergrid], but probably shouldn't - ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" + ; HomeURI = "${Const|GridURL}:${Const|PublicPort}" ;; The asset types that this grid can export to / import from other grids. ;; Comma separated. @@ -755,7 +755,7 @@ ;; What is the HomeURI of users associated with this grid? ;; Can overwrite the default in [Hypergrid], but probably shouldn't - ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" + ; HomeURI = "${Const|GridURL}:${Const|PublicPort}" ;; Sets the maximum number of groups an agent may join MaxAgentGroups = 420 -- cgit v1.1