aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2014-11-30 14:57:47 -0500
committerBlueWall2014-11-30 14:57:47 -0500
commitd0f96444173d7650aa0b6b0be1eb8f2943fa58e8 (patch)
tree763804097f9c5a699c74398ef489526309edb2fe
parentSet configuration files to use key expansion for widely used common settings. (diff)
downloadopensim-SC_OLD-d0f96444173d7650aa0b6b0be1eb8f2943fa58e8.zip
opensim-SC_OLD-d0f96444173d7650aa0b6b0be1eb8f2943fa58e8.tar.gz
opensim-SC_OLD-d0f96444173d7650aa0b6b0be1eb8f2943fa58e8.tar.bz2
opensim-SC_OLD-d0f96444173d7650aa0b6b0be1eb8f2943fa58e8.tar.xz
A little bit of cleanup behind commit r5f88ceab2269
-rw-r--r--bin/Robust.HG.ini.example10
-rw-r--r--bin/config-include/GridCommon.ini.example4
-rw-r--r--bin/config-include/StandaloneCommon.ini.example6
3 files changed, 10 insertions, 10 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 8982b71..b95e115 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -259,7 +259,7 @@
259 ExportSupported = true 259 ExportSupported = true
260 260
261 ;; If you have this set under [Hypergrid], no need to set it here, leave it commented 261 ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
262 ; GatekeeperURI = "http://127.0.0.1:${Const|PublicPort}" 262 ; GatekeeperURI = "http://${Const|BaseURL}:${Const|PublicPort}"
263 263
264 264
265; * This is the configuration for the freeswitch server in grid mode 265; * This is the configuration for the freeswitch server in grid mode
@@ -574,11 +574,11 @@
574 ;; 574 ;;
575 ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept. 575 ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept.
576 ;; Leave blank or commented for no exceptions. 576 ;; Leave blank or commented for no exceptions.
577 ; AllowExcept = "http://griefer.com:${Const|PublicPort}, http://enemy.com:8002" 577 ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002"
578 ;; 578 ;;
579 ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept 579 ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept
580 ;; Leave blank or commented for no exceptions. 580 ;; Leave blank or commented for no exceptions.
581 ; DisallowExcept = "http://myfriendgrid.com:${Const|PublicPort}, http://myboss.com:8002" 581 ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002"
582 582
583 583
584[UserAgentService] 584[UserAgentService]
@@ -612,11 +612,11 @@
612 ;; 612 ;;
613 ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept 613 ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept
614 ;; Leave blank or commented for no exceptions. 614 ;; Leave blank or commented for no exceptions.
615 ; DisallowExcept_Level_0 = "http://myothergrid.com:${Const|PublicPort}, http://boss.com:8002" 615 ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002"
616 ;; 616 ;;
617 ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept. 617 ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept.
618 ;; Leave blank or commented for no exceptions. 618 ;; Leave blank or commented for no exceptions.
619 ; AllowExcept_Level_200 = "http://griefer.com:${Const|PublicPort}, http://enemy.com:8002" 619 ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
620 620
621 ;; This variable controls what is exposed to profiles of local users 621 ;; This variable controls what is exposed to profiles of local users
622 ;; as seen from outside of this grid. Leave it uncommented for exposing 622 ;; as seen from outside of this grid. Leave it uncommented for exposing
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 2c3df8d..903641e 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -40,7 +40,7 @@
40 ;; If this is a standalone world, this is the address of this instance. 40 ;; If this is a standalone world, this is the address of this instance.
41 ;; If this is a grided simulator, this is the address of the external robust server that 41 ;; If this is a grided simulator, this is the address of the external robust server that
42 ;; runs the UserAgentsService. 42 ;; runs the UserAgentsService.
43 ;; For example http://myworld.com:9000 or http://myworld.com:${Const|PublicPort} 43 ;; For example http://myworld.com:9000 or http://myworld.com:8002
44 ;; This is a default that can be overwritten in some sections. 44 ;; This is a default that can be overwritten in some sections.
45 ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 45 ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
46 46
@@ -48,7 +48,7 @@
48 ;; If this is a standalone world, this is the address of this instance. 48 ;; If this is a standalone world, this is the address of this instance.
49 ;; If this is a grided simulator, this is the address of the external robust server 49 ;; If this is a grided simulator, this is the address of the external robust server
50 ;; that runs the Gatekeeper service. 50 ;; that runs the Gatekeeper service.
51 ;; For example http://myworld.com:9000 or http://myworld.com:${Const|PublicPort} 51 ;; For example http://myworld.com:9000 or http://myworld.com:8002
52 ;; This is a default that can be overwritten in some sections. 52 ;; This is a default that can be overwritten in some sections.
53 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" 53 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
54 54
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f0bf3c8..edccf23 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -41,7 +41,7 @@
41 ;; If this is a standalone world, this is the address of this instance. 41 ;; If this is a standalone world, this is the address of this instance.
42 ;; If this is a grided simulator, this is the address of the external robust server that 42 ;; If this is a grided simulator, this is the address of the external robust server that
43 ;; runs the UserAgentsService. 43 ;; runs the UserAgentsService.
44 ;; For example http://myworld.com:${Const|PublicPort} or http://myworld.com:8002 44 ;; For example http://myworld.com:9000 or http://myworld.com:8002
45 ;; This is a default that can be overwritten in some sections. 45 ;; This is a default that can be overwritten in some sections.
46 ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}" 46 ; HomeURI = "${Const|BaseURL}:${Const|PublicPort}"
47 47
@@ -49,7 +49,7 @@
49 ;; If this is a standalone world, this is the address of this instance. 49 ;; If this is a standalone world, this is the address of this instance.
50 ;; If this is a grided simulator, this is the address of the external robust server 50 ;; If this is a grided simulator, this is the address of the external robust server
51 ;; that runs the Gatekeeper service. 51 ;; that runs the Gatekeeper service.
52 ;; For example http://myworld.com:${Const|PublicPort} or http://myworld.com:8002 52 ;; For example http://myworld.com:9000 or http://myworld.com:8002
53 ;; This is a default that can be overwritten in some sections. 53 ;; This is a default that can be overwritten in some sections.
54 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}" 54 ; GatekeeperURI = "${Const|BaseURL}:${Const|PublicPort}"
55 55
@@ -133,7 +133,7 @@
133 MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/" 133 MapTileURL = "${Const|BaseURL}:${Const|PublicPort}/"
134 134
135 ; Url to search service 135 ; Url to search service
136 ; SearchURL = "${Const|BaseURL}:8002"; 136 ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}";
137 137
138 ; The minimum user level required for a user to be able to login. 0 by default 138 ; The minimum user level required for a user to be able to login. 0 by default
139 ; If you disable a particular user's account then you can set their login level below this number. 139 ; If you disable a particular user's account then you can set their login level below this number.