From 8b62b7d2fd31eeecc9dfa5233bd5c533d784bded Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 25 Sep 2020 21:13:56 +0100 Subject: [PATCH] on regions config make HomeURIAlias visible --- bin/config-include/GridCommon.ini.example | 36 ++++++++++--------- .../StandaloneCommon.ini.example | 9 +++++ 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index ee9b3aa3eb..4275cced02 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -35,9 +35,22 @@ ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;" [Hypergrid] - ; Uncomment the variables in this section only if you are in + ; Uncomment the variable GatekeeperURI in this section only if you are in ; Hypergrid configuration. Otherwise, ignore. + ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} + ;; If this is a standalone world, this is the address of this instance. + ;; If this is a grided simulator, this is the address of the external robust server + ;; that runs the Gatekeeper service. + ;; For example http://myworld.com:9000 or http://myworld.com:8002 + ;; This is a default that can be overwritten in some sections. + ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" + + # {GatekeeperURIAlias} {Hypergrid} {Old hostnames, FQDN or ips of the gatekeeper of this world} {} + ;; comma separated list, and port (default 80 or 443) + ;; in case there was for example a dns change, etc + ; GatekeeperURIAlias = myoldname.something.org, 127.0.0.1,127.0.1:8043 + ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} ;; If this is a standalone world, this is the address of this instance. ;; If this is a grided simulator, this is the address of the external robust server that @@ -46,17 +59,11 @@ ;; This is a default that can be overwritten in some sections. ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" - ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {} - ;; If this is a standalone world, this is the address of this instance. - ;; If this is a grided simulator, this is the address of the external robust server - ;; that runs the Gatekeeper service. - ;; For example http://myworld.com:9000 or http://myworld.com:8002 - ;; This is a default that can be overwritten in some sections. - ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" - - ;# {GatekeeperURIAlias} {Hypergrid} {Old hostnames, FQDN or ips of the gatekeeper of this world} {} - ;; comma separated list - ; GatekeeperURIAlias = myoldname.something.org, 127.0.0.1 + # {HomeURIAlias} {Hypergrid} {Old hostnames, FQDN or ips of the gatekeeper of this world} {} + ;; comma separated list, and port (default 80 or 443) + ;; in case there was for example a dns change, etc but it is still same grid + ; HomeURIAlias = myoldname.something.org, 127.0.0.1,127.0.1:8043 + [Modules] ;; Choose one cache module and the corresponding config file, if it exists. @@ -198,11 +205,6 @@ [HGAssetService] ; ; === HG ONLY === - ; Change this to your server - ; accessible from other grids - ; - HomeURI = "${Const|BaseURL}:${Const|PublicPort}" - ;; The asset types that this grid can export to / import from other grids. ;; Comma separated. ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 35b20ac68e..ca3a86122e 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -47,6 +47,11 @@ ;; This is a default that can be overwritten in some sections. ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" + # {GatekeeperURIAlias} {Hypergrid} {Old hostnames, FQDN or ips of the gatekeeper of this world} {} + ;; comma separated list, and port (default 80 or 443) + ;; in case there was for example a dns change, etc + ; GatekeeperURIAlias = myoldname.something.org, 127.0.0.1,127.0.1:8043 + ;# {HomeURI} {Hypergrid} {The Home URL of this world} {} ;; If this is a standalone world, this is the address of this instance. ;; If this is a grided simulator, this is the address of the external robust server that @@ -55,6 +60,10 @@ ;; This is a default that can be overwritten in some sections. HomeURI = "${Const|BaseURL}:${Const|PublicPort}" + # {HomeURIAlias} {Hypergrid} {Old hostnames, FQDN or ips of the gatekeeper of this world} {} + ;; comma separated list, and port (default 80 or 443) + ;; in case there was for example a dns change, etc + ; HomeURIAlias = myoldname.something.org, 127.0.0.1,127.0.1:8043 [Modules] ;; Choose one cache module and the corresponding config file, if it exists.