aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2014-04-26 02:42:30 +0200
committerMelanie Thielker2014-04-26 02:42:30 +0200
commit5c661baf6c197caef73e6a8fe5a2223d00a2a6ba (patch)
treee656d7a2bf8c4c24272f1bfe5d577d4bfc17090a /OpenSim/Framework
parentminor: Remove unused System.Linq reference and use ParcelFlags.None instead o... (diff)
downloadopensim-SC-5c661baf6c197caef73e6a8fe5a2223d00a2a6ba.zip
opensim-SC-5c661baf6c197caef73e6a8fe5a2223d00a2a6ba.tar.gz
opensim-SC-5c661baf6c197caef73e6a8fe5a2223d00a2a6ba.tar.bz2
opensim-SC-5c661baf6c197caef73e6a8fe5a2223d00a2a6ba.tar.xz
Allow opening a https port using only http so that nginx can be used for ssl
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 4b7d4c7..dfe9695 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -41,6 +41,7 @@ namespace OpenSim.Framework
41 41
42 // "Out of band" managemnt https 42 // "Out of band" managemnt https
43 public bool ssl_listener = false; 43 public bool ssl_listener = false;
44 public bool ssl_external = false;
44 public uint https_port = 0; 45 public uint https_port = 0;
45 public string cert_path = String.Empty; 46 public string cert_path = String.Empty;
46 public string cert_pass = String.Empty; 47 public string cert_pass = String.Empty;
@@ -64,6 +65,7 @@ namespace OpenSim.Framework
64 65
65 // "Out of band management https" 66 // "Out of band management https"
66 ssl_listener = config.Configs["Network"].GetBoolean("https_listener",false); 67 ssl_listener = config.Configs["Network"].GetBoolean("https_listener",false);
68 ssl_external = config.Configs["Network"].GetBoolean("https_external",false);
67 if( ssl_listener) 69 if( ssl_listener)
68 { 70 {
69 cert_path = config.Configs["Network"].GetString("cert_path",String.Empty); 71 cert_path = config.Configs["Network"].GetString("cert_path",String.Empty);