aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2011-05-08 20:23:06 +0100
committerMelanie2011-05-08 20:23:06 +0100
commitb451cc1ebb9e950bb93e790ab9e83aff30a47c61 (patch)
treec9fbe41be36cf791976f9e5afabd44f69b64e747 /bin
parentEnable compressed (gzip) fatpack transfers. (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.zip
opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.gz
opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.bz2
opensim-SC_OLD-b451cc1ebb9e950bb93e790ab9e83aff30a47c61.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini18
-rw-r--r--bin/Robust.HG.ini.example20
-rw-r--r--bin/Robust.ini.example21
3 files changed, 59 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5184a07..53eac02 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)
@@ -1344,6 +1358,10 @@
1344[GridService] 1358[GridService]
1345 ;; default standalone, overridable in StandaloneCommon.ini 1359 ;; default standalone, overridable in StandaloneCommon.ini
1346 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 1360 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
1361
1362[AutoBackupModule]
1363 ;; default is module is disabled at the top level
1364 AutoBackupModuleEnabled = false
1347 1365
1348[Modules] 1366[Modules]
1349 Include-modules = "addon-modules/*/config/*.ini" 1367 Include-modules = "addon-modules/*/config/*.ini"
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 572497c..0d79e77 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -29,6 +29,26 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
29[Network] 29[Network]
30 port = 8003 30 port = 8003
31 31
32 ; HTTPS for "Out of band" management applications such as the remote admin
33 ; module. May specify https_main = True to make the main http server
34 ; use https or "False" to make the main server HTTP
35 ; https_main = False
36 ;
37 ; Create https_listener = "True" will create a listener on the port
38 ; specified. Provide the path to your server certificate along with it's
39 ; password
40 ; https_listener = False
41 ;
42 ; Set our listener to this port
43 ; https_port = 0
44 ;
45 ; Path to X509 certificate
46 ; cert_path = "path/to/cert.p12"
47 ;
48 ; Password for cert
49 ; cert_pass = "password"
50
51
32; * The following are for the remote console 52; * The following are for the remote console
33; * They have no effect for the local or basic console types 53; * They have no effect for the local or basic console types
34; * Leave commented to diable logins to the console 54; * Leave commented to diable logins to the console
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