diff options
author | Diva Canto | 2011-05-06 09:09:13 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-06 09:09:13 -0700 |
commit | 50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe (patch) | |
tree | 546d13e4f4925b82dc8a0fa037eeb0928d188132 /bin | |
parent | Bug fix: iars under Library weren't being loaded. (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.zip opensim-SC-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.tar.gz opensim-SC-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.tar.bz2 opensim-SC-50c0069f7d3f3fa90fcdb8f52ae02cf6f3680efe.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSimDefaults.ini | 14 | ||||
-rw-r--r-- | bin/Robust.ini.example | 21 |
2 files changed, 35 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 6d2d54d..2e192f1 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -291,6 +291,20 @@ | |||
291 | http_listener_sslport = 9001 ; Use this port for SSL connections | 291 | http_listener_sslport = 9001 ; Use this port for SSL connections |
292 | http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer | 292 | http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer |
293 | 293 | ||
294 | ; HTTPS for "Out of band" management applications such as the remote | ||
295 | ; admin module | ||
296 | ; | ||
297 | ; Create https_listener = "True" will create a listener on the port | ||
298 | ; specified. Provide the path to your server certificate along with it's | ||
299 | ; password | ||
300 | ; https_listener = False | ||
301 | ; Set our listener to this port | ||
302 | ; https_port = 0 | ||
303 | ; Path to X509 certificate | ||
304 | ; cert_path = "path/to/cert.p12" | ||
305 | ; Password for cert | ||
306 | ; cert_pass = "password" | ||
307 | |||
294 | ; Hostname to use in llRequestURL/llRequestSecureURL | 308 | ; Hostname to use in llRequestURL/llRequestSecureURL |
295 | ; if not defined - default machine name is being used | 309 | ; if not defined - default machine name is being used |
296 | ; (on Windows this mean NETBIOS name - useably only inside local network) | 310 | ; (on Windows this mean NETBIOS name - useably only inside local network) |
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 047e9ee..cc018f8 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -21,6 +21,27 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
21 | [Network] | 21 | [Network] |
22 | port = 8003 | 22 | port = 8003 |
23 | 23 | ||
24 | |||
25 | ; HTTPS for "Out of band" management applications such as the remote admin | ||
26 | ; module. May specify https_main = True to make the main http server | ||
27 | ; use https or "False" to make the main server HTTP | ||
28 | ; https_main = False | ||
29 | ; | ||
30 | ; Create https_listener = "True" will create a listener on the port | ||
31 | ; specified. Provide the path to your server certificate along with it's | ||
32 | ; password | ||
33 | ; https_listener = False | ||
34 | ; | ||
35 | ; Set our listener to this port | ||
36 | ; https_port = 0 | ||
37 | ; | ||
38 | ; Path to X509 certificate | ||
39 | ; cert_path = "path/to/cert.p12" | ||
40 | ; | ||
41 | ; Password for cert | ||
42 | ; cert_pass = "password" | ||
43 | |||
44 | |||
24 | ; * The following are for the remote console | 45 | ; * The following are for the remote console |
25 | ; * They have no effect for the local or basic console types | 46 | ; * They have no effect for the local or basic console types |
26 | ; * Leave commented to diable logins to the console | 47 | ; * Leave commented to diable logins to the console |