diff options
Diffstat (limited to 'bin')
-rw-r--r-- | bin/config-include/Grid.ini | 1 | ||||
-rw-r--r-- | bin/config-include/GridCommon.ini.example | 10 | ||||
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 1 | ||||
-rw-r--r-- | bin/config-include/Standalone.ini | 4 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 10 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 4 |
6 files changed, 24 insertions, 6 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index da860c6..95d6264 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
@@ -14,6 +14,7 @@ | |||
14 | AvatarServices = "RemoteAvatarServicesConnector" | 14 | AvatarServices = "RemoteAvatarServicesConnector" |
15 | NeighbourServices = "RemoteNeighbourServicesConnector" | 15 | NeighbourServices = "RemoteNeighbourServicesConnector" |
16 | AuthenticationServices = "RemoteAuthenticationServicesConnector" | 16 | AuthenticationServices = "RemoteAuthenticationServicesConnector" |
17 | AuthorizationServices = "LocalAuthorizationServicesConnector" | ||
17 | PresenceServices = "RemotePresenceServicesConnector" | 18 | PresenceServices = "RemotePresenceServicesConnector" |
18 | UserAccountServices = "RemoteUserAccountServicesConnector" | 19 | UserAccountServices = "RemoteUserAccountServicesConnector" |
19 | GridUserServices = "RemoteGridUserServicesConnector" | 20 | GridUserServices = "RemoteGridUserServicesConnector" |
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 712481d..fa6f525 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example | |||
@@ -146,3 +146,13 @@ | |||
146 | 146 | ||
147 | [MapImageService] | 147 | [MapImageService] |
148 | MapImageServerURI = "http://mygridserver.com:8003" | 148 | MapImageServerURI = "http://mygridserver.com:8003" |
149 | |||
150 | [AuthorizationService] | ||
151 | ; If you have regions with access restrictions | ||
152 | ; specify them here using the convention | ||
153 | ; Region_<Region_Name> = <flags> | ||
154 | ; Valid flags are: | ||
155 | ; DisallowForeigners -- HG visitors not allowed | ||
156 | ; DisallowResidents -- only Admins and Managers allowed | ||
157 | ; Example: | ||
158 | ; Region_Test_1 = "DisallowForeigners" | ||
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 5f0ba37..da447f1 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -17,6 +17,7 @@ | |||
17 | AvatarServices = "RemoteAvatarServicesConnector" | 17 | AvatarServices = "RemoteAvatarServicesConnector" |
18 | NeighbourServices = "RemoteNeighbourServicesConnector" | 18 | NeighbourServices = "RemoteNeighbourServicesConnector" |
19 | AuthenticationServices = "RemoteAuthenticationServicesConnector" | 19 | AuthenticationServices = "RemoteAuthenticationServicesConnector" |
20 | AuthorizationServices = "LocalAuthorizationServicesConnector" | ||
20 | PresenceServices = "RemotePresenceServicesConnector" | 21 | PresenceServices = "RemotePresenceServicesConnector" |
21 | UserAccountServices = "RemoteUserAccountServicesConnector" | 22 | UserAccountServices = "RemoteUserAccountServicesConnector" |
22 | GridUserServices = "RemoteGridUserServicesConnector" | 23 | GridUserServices = "RemoteGridUserServicesConnector" |
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 6ad4ac9..d307387 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -9,6 +9,7 @@ | |||
9 | InventoryServices = "LocalInventoryServicesConnector" | 9 | InventoryServices = "LocalInventoryServicesConnector" |
10 | NeighbourServices = "LocalNeighbourServicesConnector" | 10 | NeighbourServices = "LocalNeighbourServicesConnector" |
11 | AuthenticationServices = "LocalAuthenticationServicesConnector" | 11 | AuthenticationServices = "LocalAuthenticationServicesConnector" |
12 | AuthorizationServices = "LocalAuthorizationServicesConnector" | ||
12 | GridServices = "LocalGridServicesConnector" | 13 | GridServices = "LocalGridServicesConnector" |
13 | PresenceServices = "LocalPresenceServicesConnector" | 14 | PresenceServices = "LocalPresenceServicesConnector" |
14 | UserAccountServices = "LocalUserAccountServicesConnector" | 15 | UserAccountServices = "LocalUserAccountServicesConnector" |
@@ -47,9 +48,6 @@ | |||
47 | [AvatarService] | 48 | [AvatarService] |
48 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" | 49 | LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService" |
49 | 50 | ||
50 | [AuthorizationService] | ||
51 | LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" | ||
52 | |||
53 | [AuthenticationService] | 51 | [AuthenticationService] |
54 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 52 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
55 | 53 | ||
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 2f39218..2a7e49e 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -231,3 +231,13 @@ | |||
231 | [MapImageService] | 231 | [MapImageService] |
232 | ; Set this if you want to change the default | 232 | ; Set this if you want to change the default |
233 | ; TilesStoragePath = "maptiles" | 233 | ; TilesStoragePath = "maptiles" |
234 | |||
235 | [AuthorizationService] | ||
236 | ; If you have regions with access restrictions | ||
237 | ; specify them here using the convention | ||
238 | ; Region_<Region_Name> = <flags> | ||
239 | ; Valid flags are: | ||
240 | ; DisallowForeigners -- HG visitors not allowed | ||
241 | ; DisallowResidents -- only Admins and Managers allowed | ||
242 | ; Example: | ||
243 | ; Region_Test_1 = "DisallowForeigners" \ No newline at end of file | ||
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 00beb31..286d0a1 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -12,6 +12,7 @@ | |||
12 | InventoryServices = "HGInventoryBroker" | 12 | InventoryServices = "HGInventoryBroker" |
13 | NeighbourServices = "LocalNeighbourServicesConnector" | 13 | NeighbourServices = "LocalNeighbourServicesConnector" |
14 | AuthenticationServices = "LocalAuthenticationServicesConnector" | 14 | AuthenticationServices = "LocalAuthenticationServicesConnector" |
15 | AuthorizationServices = "LocalAuthorizationServicesConnector" | ||
15 | GridServices = "LocalGridServicesConnector" | 16 | GridServices = "LocalGridServicesConnector" |
16 | PresenceServices = "LocalPresenceServicesConnector" | 17 | PresenceServices = "LocalPresenceServicesConnector" |
17 | UserAccountServices = "LocalUserAccountServicesConnector" | 18 | UserAccountServices = "LocalUserAccountServicesConnector" |
@@ -68,9 +69,6 @@ | |||
68 | LibraryName = "OpenSim Library" | 69 | LibraryName = "OpenSim Library" |
69 | DefaultLibrary = "./inventory/Libraries.xml" | 70 | DefaultLibrary = "./inventory/Libraries.xml" |
70 | 71 | ||
71 | [AuthorizationService] | ||
72 | LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService" | ||
73 | |||
74 | [AuthenticationService] | 72 | [AuthenticationService] |
75 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" | 73 | LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService" |
76 | 74 | ||