Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

1 files changed, 18 insertions, 0 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6d2d54d..b32d198 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -291,6 +291,20 @@
     http_listener_sslport = 9001 ; Use this port for SSL connections
     http_listener_ssl_cert = "" ; Currently unused, but will be used for OSHttpServer
 
+    ; HTTPS for "Out of band" management applications such as the remote 
+    ; admin module
+    ;
+    ; Create https_listener = "True" will create a listener on the port
+    ; specified. Provide the path to your server certificate along with it's
+    ; password
+    ; https_listener = False
+    ; Set our listener to this port
+    ; https_port = 0
+    ; Path to X509 certificate
+    ; cert_path = "path/to/cert.p12"
+    ; Password for cert
+    ; cert_pass = "password"
+
     ; Hostname to use in llRequestURL/llRequestSecureURL
     ; if not defined - default machine name is being used
     ; (on Windows this mean NETBIOS name - useably only inside local network)
@@ -1352,6 +1366,10 @@
 [GridService]
     ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+        
+[AutoBackupModule]
+        ;; default is module is disabled at the top level
+        AutoBackupModuleEnabled = false
 
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"