Set configuration files to use key expansion for widely used common settings.

5 files changed, 211 insertions, 153 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 0374877..da88e7f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -42,6 +42,17 @@
 ;;    out.
 
 
+[Const]
+    ;# {BaseURL} {} {BaseURL} {"http://example.com","http://127.0.0.1"} "http://127.0.0.1"
+    BaseURL = http://127.0.0.1
+    
+    ;# {PublicPort} {} {PublicPort} {8002} "8002"
+    PublicPort = "8002"
+
+    ;# {PrivatePort} {} {PublicPort} {8003} "8003"
+    PrivatePort = "8003"
+
+
 [Startup]
     ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) "
     ;; Console prompt
@@ -597,7 +608,8 @@
 
     ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule Offline Message Module V2:Offline Message Module V2} {URL of offline messaging service} {}
     ;; URL of web service for offline message storage. Leave it commented if your service is local to the sim.
-    ; OfflineMessageURL = http://yourserver/Offline.php or http://yourrobustserver:8003
+    ; OfflineMessageURL = ${Const|BaseURL}/Offline.php
+    ; OfflineMessageURL = ${Const|BaseURL}:${Const|PrivtePort}
 
     ;# {StorageProvider} {Offline Message Module V2:Offline Message Module V2} {DLL that provides the storage interface} {OpenSim.Data.MySQL.dll}
     ;; For standalones, this is the storage dll.
@@ -1037,7 +1049,7 @@
     ;; URI for the groups services of this grid
     ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
     ;; or http://mygridserver.com:82/Grid/ for SimianGrid
-    ;; or http:://mygridserver.com:8003 for robust, V2
+    ;; or http:://${Const|BaseURL}:${Const|PrivatePort} for robust, V2
     ;; Leave it commented for standalones, V2
     ; GroupsServerURI = ""
 
@@ -1105,13 +1117,13 @@
   ;# {ProfileServiceURL} {} {Set url to UserProfilesService} {}
   ;; Set the value of the url to your UserProfilesService
   ;; If un-set / "" the module is disabled
-  ;; ProfileServiceURL = http://127.0.0.1:8002
+  ;; ProfileServiceURL = ${Const|BaseURL}:${Const|PublicPort}
 
 [XBakes]
   ;# {URL} {} {Set URL for Baked texture service} {}
   ;; Sets the URL for the baked texture ROBUST service.
   ;; Disabled when unset.
-  ;; URL = http://127.0.0.1:8003
+  ;; URL = ${Const|BaseURL}:${Const|PrivatePort}
 
 [Architecture]
     ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index fe2b4f9..8982b71 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -10,6 +10,29 @@
 ; *            OpenSim.Server.Handlers.dll:XInventoryInConnector 
 ; * are started in port 8002, outside the firewall
 ; *
+; **
+; *
+; * The Const section allows us to define some basic information that we
+; * will use throughout our configuration. We will provide examples for 
+; * setting the base url of the Robust server and the public and private ports
+; * it uses. Changing the values of the constants will set the operating
+; * parameters thoughout the configuration. Other constants that may prove
+; * to be useful may be added to the followin section. They may be 
+; * referenced anywhere in the configuration by using ${Const|Name}. One
+; * such use is providing a base path for setting locations that Robust
+; * uses to write data.
+; * 
+[Const]
+
+    ; The URL of the Robust server
+    BaseURL = "http://127.0.0.1"
+    
+    ; The public port of the Robust server
+    PublicPort = "8002"
+
+    ; The private port of the Robust server
+    PrivatePort = "8003"
+
 ; * The startup section lists all the connectors to start up in this server
 ; * instance. This may be only one, or it may be the entire server suite.
 ; * Multiple connectors should be separated by commas.
@@ -49,52 +72,52 @@
 
 
 [ServiceList]
-    AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
-    InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
+    AssetServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+    InventoryInConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:XInventoryInConnector"
     ;; Uncomment if you have set up Freeswitch (see [FreeswitchService] below)
     ;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
-    GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
-    GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
-    AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
-    OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
-    AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
-    LLLoginServiceInConnector = "8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector"
-    PresenceServiceConnector = "8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
-    UserAccountServiceConnector = "8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
-    GridUserServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
-    FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
-    MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
-    MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
+    GridServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:GridServiceConnector"
+    GridInfoServerInConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
+    AuthenticationServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
+    OpenIdServerConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
+    AvatarServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
+    LLLoginServiceInConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector"
+    PresenceServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
+    UserAccountServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
+    GridUserServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
+    FriendsServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
+    MapAddServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
+    MapGetServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
     ;; Uncomment this if you want offline IM to work
-    ; OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
+    ; OfflineIMServiceConnector = "${Const|PrivatePort}/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
     ;; Uncomment this if you want Groups V2 to work
-    ; GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
+    ; GroupsServiceConnector = "${Const|PrivatePort}/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
     ;; Uncomment to provide bakes caching
-    ;BakedTextureService = "8003/OpenSim.Server.Handlers.dll:XBakesConnector"
+    ;BakedTextureService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:XBakesConnector"
 
     ;; Additions for Hypergrid
 
-    GatekeeperServiceInConnector = "8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector"
-    UserAgentServerConnector = "8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector"
-    HeloServiceInConnector = "8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
-    HGFriendsServerConnector = "8002/OpenSim.Server.Handlers.dll:HGFriendsServerConnector"
-    InstantMessageServerConnector = "8002/OpenSim.Server.Handlers.dll:InstantMessageServerConnector"
-    HGInventoryServiceConnector = "HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector"
-    HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+    GatekeeperServiceInConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector"
+    UserAgentServerConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserAgentServerConnector"
+    HeloServiceInConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
+    HGFriendsServerConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:HGFriendsServerConnector"
+    InstantMessageServerConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:InstantMessageServerConnector"
+    HGInventoryServiceConnector = "HGInventoryService@${Const|PublicPort}/OpenSim.Server.Handlers.dll:XInventoryInConnector"
+    HGAssetServiceConnector = "HGAssetService@${Const|PublicPort}/OpenSim.Server.Handlers.dll:AssetServiceConnector"
     ;; Uncomment this if you want Groups V2, HG to work
-    ; HGGroupsServiceConnector = "8002/OpenSim.Addons.Groups.dll:HGGroupsServiceRobustConnector"
+    ; HGGroupsServiceConnector = "${Const|PublicPort}/OpenSim.Addons.Groups.dll:HGGroupsServiceRobustConnector"
     ;; Additions for other add-on modules. For example:
-    ;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector"
+    ;; WifiServerConnector = "${Const|PublicPort}/Diva.Wifi.dll:WifiServerConnector"
 
     ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
-    ; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector"
+    ; UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
 
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
 ; *
 [Network]
-    port = 8003
+    port = ${Const|PrivatePort}
 
     ; HTTPS for "Out of band" management applications such as the remote admin
     ; module. May specify https_main = True to make the main http server
@@ -116,7 +139,7 @@
     ; cert_pass = "password"
 
     ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
-    ;; Use this if your central services in port 8003 need to be accessible on the Internet
+    ;; Use this if your central services in port ${Const|PrivatePort} need to be accessible on the Internet
     ;; but you want to protect them from unauthorized access.
     ; AuthType = "BasicHttpAuthentication"
     ; HttpAuthUsername = "some_username"
@@ -142,16 +165,16 @@
     ;# {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
+        ;; For example http://myworld.com:${Const|PublicPort}
         ;; This is a default that can be overwritten in some sections.
-        ; HomeURI = "http://127.0.0.1:8002"
+        ; HomeURI = "${Const|BaseURL}:${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
+        ;; For example http://myworld.com:${Const|PublicPort}
         ;; This is a default that can be overwritten in some sections.
-        ; GatekeeperURI = "http://127.0.0.1:8002"
+        ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 
 [DatabaseService]
@@ -236,7 +259,7 @@
     ExportSupported = true
 
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; GatekeeperURI = "http://127.0.0.1:8002"
+    ; GatekeeperURI = "http://127.0.0.1:${Const|PublicPort}"
 
 
 ; * This is the configuration for the freeswitch server in grid mode
@@ -390,31 +413,31 @@
     AllowRemoteSetLoginLevel = "false"
 
     ; For V2 map
-    MapTileURL = "http://127.0.0.1:8002/";
+    MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/";
 
     ; Url to search service
-    ; SearchURL = "http://127.0.0.1:8002/";
+    ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}/";
 
     ; For V3 destination guide
-    ; DestinationGuide = "http://127.0.0.1/guide"
+    ; DestinationGuide = "${Const|BaseURL}/guide"
 
     ; For V3 avatar picker (( work in progress ))
-    ; AvatarPicker = "http://127.0.0.1/avatars"
+    ; AvatarPicker = "${Const|BaseURL}/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 = "http://127.0.0.1:8002"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    SRV_HomeURI = "http://127.0.0.1:8002"
-    SRV_InventoryServerURI = "http://127.0.0.1:8002"
-    SRV_AssetServerURI = "http://127.0.0.1:8002"
-    SRV_ProfileServerURI = "http://127.0.0.1:8002"
-    SRV_FriendsServerURI = "http://127.0.0.1:8002"
-    SRV_IMServerURI = "http://127.0.0.1:8002"
-    SRV_GroupsServerURI = "http://127.0.0.1:8002"
+    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}"
 
     ;; Regular expressions for controlling which client versions are accepted/denied.
     ;; An empty string means nothing is checked.
@@ -452,7 +475,7 @@
     ; Set this if you want to change the default
     ; TilesStoragePath = "maptiles"
     ;
-    ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002),
+    ; If for some reason you have the AddMapTile service outside the firewall (e.g. ${Const|PublicPort}),
     ; you may want to set this. Otherwise, don't set it, because it's already protected.
     ; GridService = "OpenSim.Services.GridService.dll:GridService"
     ;
@@ -470,7 +493,7 @@
     ; See http://opensimulator.org/wiki/GridInfo
 
     ; login uri: for grid this is the login server URI
-    login = http://127.0.0.1:8002/
+    login = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; long grid name: the long name of your grid
     gridname = "the lost continent of hippo"
@@ -480,32 +503,32 @@
 
     ; login page: optional: if it exists it will be used to tell the client to use
     ;                       this as splash page
-    ;welcome = http://127.0.0.1/welcome
+    ;welcome = ${Const|BaseURL}/welcome
 
     ; helper uri: optional: if it exists if will be used to tell the client to use
     ;                       this for all economy related things
-    ;economy = http://127.0.0.1:8002/
+    ;economy = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; web page of grid: optional: page providing further information about your grid
-    ;about = http://127.0.0.1/about/
+    ;about = ${Const|BaseURL}/about/
 
     ; account creation: optional: page providing further information about obtaining
     ;                             a user account on your grid
-    ;register = http://127.0.0.1/register
+    ;register = ${Const|BaseURL}/register
 
     ; help: optional: page providing further assistance for users of your grid
-    ;help = http://127.0.0.1/help
+    ;help = ${Const|BaseURL}/help
 
     ; password help: optional: page providing password assistance for users of your grid
-    ;password = http://127.0.0.1/password
+    ;password = ${Const|BaseURL}/password
         
     ; HG address of the gatekeeper, if you have one
     ; this is the entry point for all the regions of the world
-    ; gatekeeper = http://127.0.0.1:8002/
+    ; gatekeeper = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; HG user domain, if you have one
     ; this is the entry point for all user-related HG services
-    ; uas = http://127.0.0.1:8002/
+    ; uas = ${Const|BaseURL}:${Const|PublicPort}/
 
 
 [GatekeeperService]
@@ -520,7 +543,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 = "http://127.0.0.1:8002"
+    ; ExternalName = "${Const|BaseURL}:${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
@@ -551,11 +574,11 @@
     ;;
     ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept.
     ;; Leave blank or commented for no exceptions.
-    ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002"
+    ; AllowExcept = "http://griefer.com:${Const|PublicPort}, http://enemy.com:8002"
     ;;
     ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept
     ;; Leave blank or commented for no exceptions.
-    ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
+    ; DisallowExcept = "http://myfriendgrid.com:${Const|PublicPort}, http://myboss.com:8002"
 
 
 [UserAgentService]
@@ -589,11 +612,11 @@
     ;;
     ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept
     ;; Leave blank or commented for no exceptions.
-    ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002"
+    ; DisallowExcept_Level_0 = "http://myothergrid.com:${Const|PublicPort}, http://boss.com:8002"
         ;;
     ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
     ;; Leave blank or commented for no exceptions.
-    ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
+    ; AllowExcept_Level_200 = "http://griefer.com:${Const|PublicPort}, http://enemy.com:8002"
 
         ;; This variable controls what is exposed to profiles of local users
         ;; as seen from outside of this grid. Leave it uncommented for exposing
@@ -621,7 +644,7 @@
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
     ;; Can overwrite the default in [Hypergrid], but probably shouldn't
-    ; HomeURI = "http://127.0.0.1:8002"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 
 ; * The interface that local users get when they are in other grids.
@@ -633,7 +656,7 @@
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
     ;; Can overwrite the default in [Hypergrid], but probably shouldn't
-    ; HomeURI = "http://127.0.0.1:8002"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
@@ -678,7 +701,7 @@
 
     ;; What is the HomeURI of users associated with this grid?
     ;; Can overwrite the default in [Hypergrid], but probably shouldn't
-    ; HomeURI = "http://127.0.0.1:8002"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 
 [UserProfilesService]
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 47b8e6f..0ce16ba 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -1,6 +1,29 @@
 ; * Run
 ; * $ Robust.exe -inifile Robust.ini
 ; *
+; **
+; *
+; * The Const section allows us to define some basic information that we
+; * will use throughout our configuration. We will provide examples for 
+; * setting the base url of the Robust server and the public and private ports
+; * it uses. Changing the values of the constants will set the operating
+; * parameters thoughout the configuration. Other constants that may prove
+; * to be useful may be added to the followin section. They may be 
+; * referenced anywhere in the configuration by using ${Const|Name}. One
+; * such use is providing a base path for setting locations that Robust
+; * uses to write data.
+; * 
+[Const]
+
+    ; The URL of the Robust server
+    BaseURL = "http://127.0.0.1"
+    
+    ; The public port of the Robust server
+    PublicPort = "8002"
+
+    ; The private port of the Robust server
+    PrivatePort = "8003"
+
 
 ; * The startup section lists all the connectors to start up in this server
 ; * instance. This may be only one, or it may be the entire server suite.
@@ -40,37 +63,37 @@
     ConsoleHistoryFileLines = 100
   
 [ServiceList]
-    AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
-    InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
+    AssetServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+    InventoryInConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:XInventoryInConnector"
     ;; Uncomment if you have set up Freeswitch (see [FreeswitchService] below)
     ;VoiceConnector = "8004/OpenSim.Server.Handlers.dll:FreeswitchServerConnector"
-    GridServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridServiceConnector"
-    GridInfoServerInConnector = "8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
-    AuthenticationServiceConnector = "8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
-    OpenIdServerConnector = "8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
-    AvatarServiceConnector = "8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
-    LLLoginServiceInConnector = "8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector"
-    PresenceServiceConnector = "8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
-    UserAccountServiceConnector = "8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
-    GridUserServiceConnector = "8003/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
-    FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
-    MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
-    MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
+    GridServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:GridServiceConnector"
+    GridInfoServerInConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:GridInfoServerInConnector"
+    AuthenticationServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector"
+    OpenIdServerConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:OpenIdServerConnector"
+    AvatarServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:AvatarServiceConnector"
+    LLLoginServiceInConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector"
+    PresenceServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:PresenceServiceConnector"
+    UserAccountServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
+    GridUserServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:GridUserServiceConnector"
+    FriendsServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
+    MapAddServiceConnector = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
+    MapGetServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
     ;; Uncomment this if you want offline IM to work
-    ;OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
+    ;OfflineIMServiceConnector = "${Const|PrivatePort}/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
     ;; Uncomment this if you want Groups V2 to work
-    ;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
+    ;GroupsServiceConnector = "${Const|PrivatePort}/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
     ;; Uncomment to provide bakes caching
-    ;BakedTextureService = "8003/OpenSim.Server.Handlers.dll:XBakesConnector"
+    ;BakedTextureService = "${Const|PrivatePort}/OpenSim.Server.Handlers.dll:XBakesConnector"
 
     ;; Uncomment for UserProfiles see [UserProfilesService] to configure...
-    ; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector"
+    ; UserProfilesServiceConnector = "${Const|PublicPort}/OpenSim.Server.Handlers.dll:UserProfilesConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
 ; *
 [Network]
-    port = 8003
+    port = ${Const|PrivatePort}
 
     ; HTTPS for "Out of band" management applications such as the remote admin
     ; module. May specify https_main = True to make the main http server
@@ -92,7 +115,7 @@
     ; cert_pass = "password"
 
     ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
-    ;; Use this if your central services in port 8003 need to be accessible on the Internet
+    ;; Use this if your central services in port ${Const|PrivatePort} need to be accessible on the Internet
     ;; but you want to protect them from unauthorized access.
     ; AuthType = "BasicHttpAuthentication"
     ; HttpAuthUsername = "some_username"
@@ -348,16 +371,16 @@
     AllowRemoteSetLoginLevel = "false"
 
     ; For V2 map
-    MapTileURL = "http://127.0.0.1:8002/";
+    MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/";
 
     ; Url to search service
-    ; SearchURL = "http://127.0.0.1:8002/";
+    ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}/";
 
     ; For V3 destination guide
-    ; DestinationGuide = "http://127.0.0.1/guide"
+    ; DestinationGuide = "${Const|BaseURL}/guide"
 
     ; For V3 avatar picker (( work in progress ))
-    ; AvatarPicker = "http://127.0.0.1/avatars"
+    ; AvatarPicker = "${Const|BaseURL}/avatars"
 
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
@@ -424,7 +447,7 @@
         ; Set this if you want to change the default
         ; TilesStoragePath = "maptiles"
         ;
-        ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002),
+        ; If for some reason you have the AddMapTile service outside the firewall (e.g. ${Const|PublicPort}),
         ; you may want to set this. Otherwise, don't set it, because it's already protected.
         ; GridService = "OpenSim.Services.GridService.dll:GridService"
         ;
@@ -447,7 +470,7 @@
     ; See http://opensimulator.org/wiki/GridInfo
 
     ; login uri: for grid this is the login server URI
-    login = http://127.0.0.1:8002/
+    login = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; long grid name: the long name of your grid
     gridname = "the lost continent of hippo"
@@ -457,24 +480,24 @@
 
     ; login page: optional: if it exists it will be used to tell the client to use
     ;                       this as splash page
-    ;welcome = http://127.0.0.1/welcome
+    ;welcome = ${Const|BaseURL}/welcome
 
     ; helper uri: optional: if it exists if will be used to tell the client to use
     ;                       this for all economy related things
-    ;economy = http://127.0.0.1:8002/
+    ;economy = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; web page of grid: optional: page providing further information about your grid
-    ;about = http://127.0.0.1/about/
+    ;about = ${Const|BaseURL}/about/
 
     ; account creation: optional: page providing further information about obtaining
     ;                             a user account on your grid
-    ;register = http://127.0.0.1/register
+    ;register = ${Const|BaseURL}/register
 
     ; help: optional: page providing further assistance for users of your grid
-    ;help = http://127.0.0.1/help
+    ;help = ${Const|BaseURL}/help
 
     ; password help: optional: page providing password assistance for users of your grid
-    ;password = http://127.0.0.1/password
+    ;password = ${Const|BaseURL}/password
 
 
 [UserProfilesService]
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 59eebd8..2c3df8d 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -40,17 +40,17 @@
     ;; 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
+    ;; For example http://myworld.com:9000 or http://myworld.com:${Const|PublicPort}
     ;; This is a default that can be overwritten in some sections.
-    ; HomeURI = "http://127.0.0.1:9000"
+    ; 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
+    ;; For example http://myworld.com:9000 or http://myworld.com:${Const|PublicPort}
     ;; This is a default that can be overwritten in some sections.
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -78,25 +78,25 @@
     ;
     ; Change this to your grid-wide asset server.  Do not add a slash to the end of any of these addresses.
     ;
-    AssetServerURI = "http://mygridserver.com:8003"
+    AssetServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [InventoryService]
     ;
     ; Change this to your grid-wide inventory server
     ;
-    InventoryServerURI = "http://mygridserver.com:8003"
+    InventoryServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [GridInfo]
     ;
     ; Change this to your grid info service
     ;
-    GridInfoURI = "http://mygridserver.com:8002"
+    GridInfoURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [GridService]
     ;
     ; Change this to your grid-wide grid server
     ;
-    GridServerURI = "http://mygridserver.com:8003"
+    GridServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
     ;AllowHypergridMapSearch = true
 
     ;; Directory for map tile images of linked regions
@@ -105,51 +105,51 @@
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
     ;; (usually bundled with the rest of the services in one 
-    ;; Robust server in port 8002, but not always)
-    Gatekeeper="http://mygridserver.com:8002"
+    ;; Robust server in port ${Const|PublicPort}, but not always)
+    Gatekeeper="${Const|BaseURL}:${Const|PublicPort}"
 
 [Messaging]
     ; === HG ONLY ===
     ;; Change this to the address of your Gatekeeper service
     ;; (usually bundled with the rest of the services in one 
-    ;; Robust server in port 8002, but not always)
-    Gatekeeper = "http://mygridserver.com:8002"
+    ;; Robust server in port ${Const|PublicPort}, but not always)
+    Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
 
 [AvatarService]
     ;
     ; Change this to your grid-wide grid server
     ;
-    AvatarServerURI = "http://mygridserver.com:8003"
+    AvatarServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [PresenceService]
     ;
     ; Change this to your grid-wide presence server
     ;
-    PresenceServerURI = "http://mygridserver.com:8003"
+    PresenceServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [UserAccountService]
     ;
     ; Change this to your grid-wide user accounts server
     ;
-    UserAccountServerURI = "http://mygridserver.com:8003"
+    UserAccountServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [GridUserService]
     ;
     ; Change this to your grid-wide user accounts server
     ;
-    GridUserServerURI = "http://mygridserver.com:8003"
+    GridUserServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [AuthenticationService]
     ;
     ; Change this to your grid-wide authentication server
     ;
-    AuthenticationServerURI = "http://mygridserver.com:8003"
+    AuthenticationServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [FriendsService]
     ;
     ; Change this to your grid-wide friends server
     ;
-    FriendsServerURI = "http://mygridserver.com:8003"
+    FriendsServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [HGInventoryAccessModule]
     ;
@@ -157,8 +157,8 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    HomeURI = "http://mygridserver.com:8002"
-    Gatekeeper = "http://mygridserver.com:8002"
+    HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
+    Gatekeeper = "${Const|BaseURL}:${Const|PublicPort}"
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; set this to false. You may want to do this on sims that have licensed content.
         ;; Default is true.
@@ -173,7 +173,7 @@
         ;; while separating regions' assets from users' assets. Asset transfer between 
         ;; the users' asset server and the regions' asset server is done in HG-like manner.
     ; CheckSeparateAssets = false
-    ; RegionHGAssetServerURI = http://mygridserver.com:8002
+    ; RegionHGAssetServerURI = ${Const|BaseURL}:${Const|PublicPort}
 
 
 [HGAssetService]
@@ -182,7 +182,7 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    HomeURI = "http://mygridserver.com:8002"
+    HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
@@ -205,10 +205,10 @@
     ; === HG ONLY ===
     ; Change this to your user agent server (HG robust)
     ;
-    UserAgentServerURI = "http://mygridserver.com:8002"
+    UserAgentServerURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [MapImageService]
-        MapImageServerURI = "http://mygridserver.com:8003"
+        MapImageServerURI = "${Const|BaseURL}:${Const|PrivatePort}"
 
 [AuthorizationService]
   ; If you have regions with access restrictions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index c4ece54..f0bf3c8 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -41,17 +41,17 @@
     ;; 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
+    ;; For example http://myworld.com:${Const|PublicPort} or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
-    ; HomeURI = "http://127.0.0.1:9000"
+    ; 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
+    ;; For example http://myworld.com:${Const|PublicPort} or http://myworld.com:8002
     ;; This is a default that can be overwritten in some sections.
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [Modules]
     ;; Choose one cache module and the corresponding config file, if it exists.
@@ -111,7 +111,7 @@
 
     ; === HG ONLY ===
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; GatekeeperURI="http://127.0.0.1:9000"
+    ; GatekeeperURI="${Const|BaseURL}:${Const|PublicPort}"
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
@@ -120,20 +120,20 @@
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
     ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
-    SRV_HomeURI = "http://127.0.0.1:9000"    
-    SRV_InventoryServerURI = "http://127.0.0.1:9000"
-    SRV_AssetServerURI = "http://127.0.0.1:9000"
-    SRV_ProfileServerURI = "http://127.0.0.1:9000"
-    SRV_FriendsServerURI = "http://127.0.0.1:9000"
-    SRV_IMServerURI = "http://127.0.0.1:9000"
+    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}"
 
     ;; For Viewer 2
-    MapTileURL = "http://127.0.0.1:9000/"
+    MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/"
 
     ; Url to search service
-    ; SearchURL = "http://127.0.0.1:8002";
+    ; SearchURL = "${Const|BaseURL}:8002";
 
     ; 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.
@@ -227,7 +227,7 @@
     ; See http://opensimulator.org/wiki/GridInfo
 
     ; login uri: for grid this is the login server URI
-    login = http://127.0.0.1:9000/
+    login = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; long grid name: the long name of your grid
     gridname = "the lost continent of hippo"
@@ -238,37 +238,37 @@
     ; login page: optional: if it exists it will be used to tell the client to use
     ;                       this as splash page
     ; currently unused
-    ;welcome = http://127.0.0.1/welcome
+    ;welcome = ${Const|BaseURL}/welcome
 
     ; helper uri: optional: if it exists if will be used to tell the client to use
     ;                       this for all economy related things
     ; currently unused
-    ;economy = http://127.0.0.1:9000/
+    ;economy = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; web page of grid: optional: page providing further information about your grid
     ; currently unused
-    ;about = http://127.0.0.1/about/
+    ;about = ${Const|BaseURL}/about/
 
     ; account creation: optional: page providing further information about obtaining
     ;                             a user account on your grid
     ; currently unused
-    ;register = http://127.0.0.1/register
+    ;register = ${Const|BaseURL}/register
 
     ; help: optional: page providing further assistance for users of your grid
     ; currently unused
-    ;help = http://127.0.0.1/help
+    ;help = ${Const|BaseURL}/help
 
     ; password help: optional: page providing password assistance for users of your grid
     ; currently unused
-    ;password = http://127.0.0.1/password
+    ;password = ${Const|BaseURL}/password
 
     ; HG address of the gatekeeper, if you have one
     ; this is the entry point for all the regions of the world
-    ; gatekeeper = http://127.0.0.1:9000/
+    ; gatekeeper = ${Const|BaseURL}:${Const|PublicPort}/
 
     ; HG user domain, if you have one
     ; this is the entry point for all user-related HG services
-    ; uas = http://127.0.0.1:9000/
+    ; uas = ${Const|BaseURL}:${Const|PublicPort}/
 
 [MapImageService]
         ; Set this if you want to change the default
@@ -289,7 +289,7 @@
 ;;
 [GatekeeperService]
         ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
-    ; ExternalName = "http://127.0.0.1:9000"
+    ; ExternalName = "${Const|BaseURL}:${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
@@ -353,11 +353,11 @@
 
 [HGInventoryService]
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; HomeURI = "http://127.0.0.1:9000"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 [HGAssetService]
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; HomeURI = "http://127.0.0.1:9000"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;; The asset types that this grid can export to / import from other grids.
     ;; Comma separated.
@@ -374,8 +374,8 @@
 
 [HGInventoryAccessModule]
     ;; If you have these set under [Hypergrid], no need to set it here, leave it commented
-    ; HomeURI = "http://127.0.0.1:9000"
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
     ;; 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.
@@ -393,7 +393,7 @@
 [Messaging]
     ; === HG ONLY ===
     ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-    ; GatekeeperURI = "http://127.0.0.1:9000"
+    ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
 
 
 [EntityTransfer]