aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2014-05-23 16:19:43 -0700
committerDiva Canto2014-05-23 16:19:43 -0700
commit20f20895cf1444071d5edc42e11a1fb94b1b1079 (patch)
tree0c7547590a89eec47886e0a8646f86ebbf449e63 /bin
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-20f20895cf1444071d5edc42e11a1fb94b1b1079.zip
opensim-SC-20f20895cf1444071d5edc42e11a1fb94b1b1079.tar.gz
opensim-SC-20f20895cf1444071d5edc42e11a1fb94b1b1079.tar.bz2
opensim-SC-20f20895cf1444071d5edc42e11a1fb94b1b1079.tar.xz
Adds optional HTTP Basic Authentication to Robust service connectors.
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example10
-rw-r--r--bin/Robust.HG.ini.example15
-rw-r--r--bin/Robust.ini.example13
3 files changed, 38 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f3cd603..3f9aed6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -470,6 +470,16 @@
470 ;; web server 470 ;; web server
471 ; user_agent = "OpenSim LSL (Mozilla Compatible)" 471 ; user_agent = "OpenSim LSL (Mozilla Compatible)"
472 472
473 ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
474 ;; Use this if your central services in port 8003 need to be accessible on the Internet
475 ;; but you want to protect them from unauthorized access. The username and password
476 ;; here need to match the ones in the Robust service configuration.
477 ; AuthType = "BasicHttpAuthentication"
478 ; HttpAuthUsername = "some_username"
479 ; HttpAuthPassword = "some_password"
480 ;;
481 ;; Any of these 3 variables above can be overriden in any of the service sections.
482
473 483
474[XMLRPC] 484[XMLRPC]
475 ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule 485 ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index e385200..aaa78ff 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -104,6 +104,21 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
104 ; Password for cert 104 ; Password for cert
105 ; cert_pass = "password" 105 ; cert_pass = "password"
106 106
107 ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
108 ;; Use this if your central services in port 8003 need to be accessible on the Internet
109 ;; but you want to protect them from unauthorized access.
110 ; AuthType = "BasicHttpAuthentication"
111 ; HttpAuthUsername = "some_username"
112 ; HttpAuthPassword = "some_password"
113 ;;
114 ;; AuthType above can be overriden in any of the service sections below by
115 ; AuthType = "None"
116 ;; This is useful in cases where you want to protect most of the services,
117 ;; but unprotect individual services. Username and Password can also be
118 ;; overriden if you want to use different credentials for the different services.
119 ;; Hypgergrid services are not affected by this; they are publicly available
120 ;; by design.
121
107 122
108; * The following are for the remote console 123; * The following are for the remote console
109; * They have no effect for the local or basic console types 124; * They have no effect for the local or basic console types
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 2f1a627..203c0e0 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -81,6 +81,19 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
81 ; Password for cert 81 ; Password for cert
82 ; cert_pass = "password" 82 ; cert_pass = "password"
83 83
84 ;; The follow 3 variables are for HTTP Basic Authentication for the Robust services.
85 ;; Use this if your central services in port 8003 need to be accessible on the Internet
86 ;; but you want to protect them from unauthorized access.
87 ; AuthType = "BasicHttpAuthentication"
88 ; HttpAuthUsername = "some_username"
89 ; HttpAuthPassword = "some_password"
90 ;;
91 ;; AuthType above can be overriden in any of the service sections below by
92 ; AuthType = "None"
93 ;; This is useful in cases where you want to protect most of the services,
94 ;; but unprotect individual services. Username and Password can also be
95 ;; overriden if you want to use different credentials for the different services.
96
84 97
85; * The following are for the remote console 98; * The following are for the remote console
86; * They have no effect for the local or basic console types 99; * They have no effect for the local or basic console types