aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorMelanie2010-09-15 15:56:03 +0100
committerMelanie2010-09-15 15:56:03 +0100
commit0d034712baac235df7aea019e259c101d9ff4517 (patch)
treef625e3701ae70459a648aacd3808e112c2b1e861 /bin/config-include
parentFix the above (diff)
downloadopensim-SC_OLD-0d034712baac235df7aea019e259c101d9ff4517.zip
opensim-SC_OLD-0d034712baac235df7aea019e259c101d9ff4517.tar.gz
opensim-SC_OLD-0d034712baac235df7aea019e259c101d9ff4517.tar.bz2
opensim-SC_OLD-0d034712baac235df7aea019e259c101d9ff4517.tar.xz
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
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/Grid.ini1
-rw-r--r--bin/config-include/GridCommon.ini.example3
-rw-r--r--bin/config-include/GridHypergrid.ini1
-rw-r--r--bin/config-include/StandaloneCommon.ini.example3
4 files changed, 6 insertions, 2 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 4a6a082..1794573 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -14,7 +14,6 @@
14 AvatarServices = "RemoteAvatarServicesConnector" 14 AvatarServices = "RemoteAvatarServicesConnector"
15 NeighbourServices = "RemoteNeighbourServicesConnector" 15 NeighbourServices = "RemoteNeighbourServicesConnector"
16 AuthenticationServices = "RemoteAuthenticationServicesConnector" 16 AuthenticationServices = "RemoteAuthenticationServicesConnector"
17 AuthorizationServices = "RemoteAuthorizationServicesConnector"
18 PresenceServices = "RemotePresenceServicesConnector" 17 PresenceServices = "RemotePresenceServicesConnector"
19 UserAccountServices = "RemoteUserAccountServicesConnector" 18 UserAccountServices = "RemoteUserAccountServicesConnector"
20 GridUserServices = "RemoteGridUserServicesConnector" 19 GridUserServices = "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index c2cd5c3..3ab11b8 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -93,3 +93,6 @@
93 ;; Optionally, the port for the LLProxyLoginModule module can be changed 93 ;; Optionally, the port for the LLProxyLoginModule module can be changed
94 94
95 ;Setup_LLProxyLoginModule = "9090/" 95 ;Setup_LLProxyLoginModule = "9090/"
96
97 ;; Authorization is not on by default, as it depends on external php
98 ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index d69a945..cb9ead4 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -17,7 +17,6 @@
17 AvatarServices = "RemoteAvatarServicesConnector" 17 AvatarServices = "RemoteAvatarServicesConnector"
18 NeighbourServices = "RemoteNeighbourServicesConnector" 18 NeighbourServices = "RemoteNeighbourServicesConnector"
19 AuthenticationServices = "RemoteAuthenticationServicesConnector" 19 AuthenticationServices = "RemoteAuthenticationServicesConnector"
20 AuthorizationServices = "RemoteAuthorizationServicesConnector"
21 PresenceServices = "RemotePresenceServicesConnector" 20 PresenceServices = "RemotePresenceServicesConnector"
22 UserAccountServices = "RemoteUserAccountServicesConnector" 21 UserAccountServices = "RemoteUserAccountServicesConnector"
23 GridUserServices = "RemoteGridUserServicesConnector" 22 GridUserServices = "RemoteGridUserServicesConnector"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 96ef602..a810393 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -40,6 +40,9 @@
40 ;; Enable this to use Freeswitch on a standalone 40 ;; Enable this to use Freeswitch on a standalone
41 ;FreeswitchServiceInConnector = True 41 ;FreeswitchServiceInConnector = True
42 42
43 ;; Authorization is not on by default, as it depends on external php
44 ;AuthorizationServices = "LocalAuthorizationServicesConnector"
45
43[FreeswitchService] 46[FreeswitchService]
44 ;; Configuration for the freeswitch service goes here 47 ;; Configuration for the freeswitch service goes here
45 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService" 48 LocalServiceModule = "OpenSim.Services.FreeswitchService.dll:FreeswitchService"