making override of openssl root a config option. makes android connec…

…t again. MACA.
turtl · Oct 21, 2018 · 41abde7 · 41abde7
1 parent b8c65a9
commit 41abde7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/www/config.js b/www/config.js
@@ -5,6 +5,7 @@ Object.merge(config, {
 	cookie_login: false,
 	base_url: window.location.toString().replace(/\/(index\.html)?$/, '/app'),
 	has_autologin: true,
+	openssl_override_root: false,
 	core: {
 		adapter: 'mobile',
 		options: {},

diff --git a/www/config.live.js b/www/config.live.js
@@ -5,6 +5,7 @@ Object.merge(config, {
 	cookie_login: false,
 	base_url: window.location.toString().replace(/\/(index\.html)?$/, '/app'),
 	has_autologin: true,
+	openssl_override_root: false,
 	core: {
 		adapter: 'mobile',
 		options: {},

diff --git a/www/core-adapter.js b/www/core-adapter.js
@@ -133,7 +133,9 @@ var core_poller = setInterval(function() {
 	// the core has no real way of loading the config.yaml asset so we need to
 	// to just pass in our entire config as a runtime config. thanks, obama.
 	core_config.config_file = ':null:';
-	core_config.openssl_cert_file = cert_file;
+	if(config.openssl_override_root) {
+		core_config.openssl_cert_file = cert_file;
+	}
 	return TurtlCore.start(JSON.stringify(core_config))
 		.then(function() {
 			core_init = true;