[Libreoffice-commits] online.git: 2 commits - loleaflet/spec loolwsd/LOOLWSD.cpp

[Mihai Varga]

 loleaflet/spec/data/lorem.odt             |binary
 loleaflet/spec/loleaflet/loleafletSpec.js |    5 ++++-
 loleaflet/spec/tilebench/TileBenchSpec.js |    5 ++++-
 loolwsd/LOOLWSD.cpp                       |   15 +++++++--------
 4 files changed, 15 insertions(+), 10 deletions(-)

New commits:
commit d57100db3b6a82b3fcb5af622c63f9ba1bb05735
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Tue Sep 8 12:01:59 2015 +0300

    loleaflet: test document

diff --git a/loleaflet/spec/data/lorem.odt b/loleaflet/spec/data/lorem.odt
new file mode 100644
index 0000000..1b26ee1
Binary files /dev/null and b/loleaflet/spec/data/lorem.odt differ
diff --git a/loleaflet/spec/loleaflet/loleafletSpec.js b/loleaflet/spec/loleaflet/loleafletSpec.js
index fd16985..dd8fe14 100644
--- a/loleaflet/spec/loleaflet/loleafletSpec.js
+++ b/loleaflet/spec/loleaflet/loleafletSpec.js
@@ -13,10 +13,13 @@ describe('TileBench', function () {
 	}
 
 	before(function () {
+		var htmlPath = window.location.pathname;
+		var dir = htmlPath.substring(0, htmlPath.lastIndexOf('/'));
+		var fileURL = 'file://' + dir + '/data/lorem.odt';
 		// initialize the map and load the document
 		map = L.map('map', {
 			server: 'ws://localhost:9980',
-			doc: 'file:///home/mihai/Desktop/test_docs/eval.odt',
+			doc: fileURL,
 			edit: false,
 			readOnly: false
 		});
diff --git a/loleaflet/spec/tilebench/TileBenchSpec.js b/loleaflet/spec/tilebench/TileBenchSpec.js
index 25882a7..b266848 100644
--- a/loleaflet/spec/tilebench/TileBenchSpec.js
+++ b/loleaflet/spec/tilebench/TileBenchSpec.js
@@ -14,10 +14,13 @@ describe('TileBench', function () {
 	}
 
 	before(function () {
+		var htmlPath = window.location.pathname;
+		var dir = htmlPath.substring(0, htmlPath.lastIndexOf('/'));
+		var fileURL = 'file://' + dir + '/data/lorem.odt';
 		// initialize the map and load the document
 		map = L.map('map', {
 			server: 'ws://localhost:9980',
-			doc: 'file:///home/mihai/Desktop/test_docs/eval.odt',
+			doc: fileURL,
 			edit: false,
 			readOnly: false
 		});
commit e17598e866830390673c89062bb34844f23e10df
Author: Mihai Varga <mihai.varga at collabora.com>
Date:   Tue Sep 8 11:31:49 2015 +0300

    loolwsd: also copy /etc/nsswitch.conf

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index b1154b0..8fc7262 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -895,15 +895,14 @@ void LOOLWSD::desktopMain()
     linkOrCopy(LOOLWSD::loTemplate, jailLOInstallation);
 
     // We need this because sometimes the hostname is not resolved
-    File resolv("/etc/resolv.conf");
-    if (resolv.exists())
+    std::vector<std::string> networkFiles = {"/etc/hosts", "/etc/nsswitch.conf", "/etc/resolv.conf"};
+    for (std::vector<std::string>::iterator it = networkFiles.begin(); it != networkFiles.end(); ++it)
     {
-        resolv.copyTo(Path(jail, "/etc").toString());
-    }
-    File hosts("/etc/hosts");
-    if (hosts.exists())
-    {
-        hosts.copyTo(Path(jail, "/etc").toString());
+        File networkFile(*it);
+        if (networkFile.exists())
+        {
+            networkFile.copyTo(Path(jail, "/etc").toString());
+        }
     }
 #ifdef __linux
     // Create the urandom and random devices