From 0d034712baac235df7aea019e259c101d9ff4517 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 15 Sep 2010 15:56:03 +0100 Subject: [PATCH] Make AuthorizationService optional and disabled by default. It depends on external PHP and the default configuration makes it throw for not having a URL to this PHP --- bin/config-include/Grid.ini | 1 - bin/config-include/GridCommon.ini.example | 3 +++ bin/config-include/GridHypergrid.ini | 1 - bin/config-include/StandaloneCommon.ini.example | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 4a6a082f0e..1794573853 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -14,7 +14,6 @@ AvatarServices = "RemoteAvatarServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" AuthenticationServices = "RemoteAuthenticationServicesConnector" - AuthorizationServices = "RemoteAuthorizationServicesConnector" PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" GridUserServices = "RemoteGridUserServicesConnector" diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index c2cd5c3ec5..3ab11b8f5b 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -93,3 +93,6 @@ ;; Optionally, the port for the LLProxyLoginModule module can be changed ;Setup_LLProxyLoginModule = "9090/" + + ;; Authorization is not on by default, as it depends on external php + ;AuthorizationServices = "RemoteAuthorizationServicesConnector" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index d69a94550b..cb9ead4391 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -17,7 +17,6 @@ AvatarServices = "RemoteAvatarServicesConnector" NeighbourServices = "RemoteNeighbourServicesConnector" AuthenticationServices = "RemoteAuthenticationServicesConnector" - AuthorizationServices = "RemoteAuthorizationServicesConnector" PresenceServices = "RemotePresenceServicesConnector" UserAccountServices = "RemoteUserAccountServicesConnector" GridUserServices = "RemoteGridUserServicesConnector" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 96ef602a03..a81039383d 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -40,6 +40,9 @@ ;; Enable this to use Freeswitch on a standalone ;FreeswitchServiceInConnector = True + ;; Authorization is not on by default, as it depends on external php + ;AuthorizationServices = "LocalAuthorizationServicesConnector" + [FreeswitchService] ;; Configuration for the freeswitch service goes here LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"