Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.

3 files changed, 74 insertions, 30 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index cb978f1..4199441 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -346,6 +346,21 @@
     ;; - "Imprudence 1.3.1" has access
     ; BannedViewerList = 
 
+    ;# {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
+        ;; runs the UserAgentsService.
+        ;; For example http://myworld.com:9000 or http://myworld.com:8002
+        ;; This is a default that can be overwritten in some sections.
+        ; HomeURI = "http://127.0.0.1:9000"
+
+    ;# {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 = "http://127.0.0.1:9000"
 
 [Estates]
     ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
@@ -961,6 +976,7 @@
     ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} 
         ;; Used for V2 in HG only. For example
         ;; http://mygridserver.com:9000 or http://mygridserver.com:8002
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
     ; HomeURI = "" 
 
     ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 3858a3c..274132e 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -22,17 +22,31 @@
 ; *
 [Startup]
 
-; Plugin Registry Location
-; Set path to directory for plugin registry. Information
-; about the registered repositories and installed plugins
-; will be stored here
-; The Robust.exe process must hvae R/W access to the location 
-RegistryLocation = "."
-
-; Modular configurations
-; Set path to directory for modular ini files...
-; The Robust.exe process must hvae R/W access to the location 
-ConfigDirectory = "/home/opensim/etc/Configs"
+        ; Plugin Registry Location
+        ; Set path to directory for plugin registry. Information
+        ; about the registered repositories and installed plugins
+        ; will be stored here
+        ; The Robust.exe process must hvae R/W access to the location 
+        RegistryLocation = "."
+
+        ; Modular configurations
+        ; Set path to directory for modular ini files...
+        ; The Robust.exe process must hvae R/W access to the location 
+        ConfigDirectory = "/home/opensim/etc/Configs"
+
+    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
+        ;; This is the address of the external robust server that
+        ;; runs the UserAgentsService, possibly this server.
+        ;; For example http://myworld.com:8002
+        ;; This is a default that can be overwritten in some sections.
+        ; HomeURI = "http://127.0.0.1:8002"
+
+    ;# {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 = "http://127.0.0.1:8002"
 
 [ServiceList]
 
@@ -155,7 +169,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
         ;; Allow Hyperlinks to be created at the console
     HypergridLinker = true
 
-        Gatekeeper = "http://127.0.0.1:8002"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+        ; GatekeeperURI = "http://127.0.0.1:8002"
 
 
 ; * This is the configuration for the freeswitch server in grid mode
@@ -309,8 +324,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; HasProxy = false
     
     ; Defaults for the users, if none is specified in the useraccounts table entry (ServiceURLs)
-    ; CHANGE THIS
-        GatekeeperURI = "http://127.0.0.1:8002"
+        ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+        ; GatekeeperURI = "http://127.0.0.1:8002"
 
     SRV_HomeURI = "http://127.0.0.1:8002"
     SRV_InventoryServerURI = "http://127.0.0.1:8002"
@@ -417,8 +432,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector"
     SimulationService ="OpenSim.Services.Connectors.dll:SimulationServiceConnector"
     ; how does the outside world reach me? This acts as public key too.
-    ; CHANGE THIS
-    ExternalName = "http://127.0.0.1:8002"
+        ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+    ; ExternalName = "http://127.0.0.1:8002"
 
     ; 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
@@ -511,7 +526,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 
         UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
         AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
-        HomeURI = "http://127.0.0.1:8002"
+
+        ;; Can overwrite the default in [Startup], but probably shouldn't
+        ; HomeURI = "http://127.0.0.1:8002"
 
 ; * The interface that local users get when they are in other grids.
 ; * This restricts the access that the rest of the world has to
@@ -520,7 +537,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 [HGAssetService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    HomeURI = "http://127.0.0.1:8002"
+
+        ;; Can overwrite the default in [Startup], but probably shouldn't
+        ; HomeURI = "http://127.0.0.1:8002"
 
     ;; The asset types that this grid can export to / import from other grids.
         ;; Comma separated.
@@ -557,6 +576,10 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 [Groups]
     ;; for the HG Groups service
     OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
-    ; What is the HomeURI of users associated with this grid?
-    HomeURI = "http://127.0.0.1:8002"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+
+    ;; What is the HomeURI of users associated with this grid?
+        ;; Can overwrite the default in [Startup], but probably shouldn't
+        ; HomeURI = "http://127.0.0.1:8002"
+
+
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ffa2d49..3129078 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -64,8 +64,8 @@
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
     ; === HG ONLY ===
-    ;; change this to the address of your simulator
-    Gatekeeper="http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI="http://127.0.0.1:9000"
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
@@ -73,7 +73,8 @@
 
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
-    GatekeeperURI = "http://127.0.0.1:9000"
+        ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
     SRV_HomeURI = "http://127.0.0.1:9000"    
     SRV_InventoryServerURI = "http://127.0.0.1:9000"
@@ -218,7 +219,8 @@
 ;; HG configurations
 ;;
 [GatekeeperService]
-    ExternalName = "http://127.0.0.1:9000"
+        ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+    ; ExternalName = "http://127.0.0.1:9000"
 
     ; 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
@@ -274,10 +276,12 @@
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
 [HGInventoryService]
-    HomeURI = "http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-    HomeURI = "http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;; The asset types that this grid can export to / import from other grids.
         ;; Comma separated.
@@ -293,8 +297,9 @@
 
 
 [HGInventoryAccessModule]
-    HomeURI = "http://127.0.0.1:9000"
-        Gatekeeper = "http://127.0.0.1:9000"
+        ;; If you have these set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
+        ; GatekeeperURI = "http://127.0.0.1:9000"
 
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
@@ -311,8 +316,8 @@
 
 [Messaging]
     ; === HG ONLY ===
-    ;; change this to the address of your simulator
-    Gatekeeper = "http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 
 [EntityTransfer]