From 5f88ceab2269a0413b9a57674a0a1b097c374fd4 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Sun, 30 Nov 2014 13:59:23 -0500 Subject: Set configuration files to use key expansion for widely used common settings. --- bin/config-include/GridCommon.ini.example | 48 ++++++++++---------- bin/config-include/StandaloneCommon.ini.example | 58 ++++++++++++------------- 2 files changed, 53 insertions(+), 53 deletions(-) (limited to 'bin/config-include') 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] -- cgit v1.1