From e4ad4c422b58f9c7c9c4e36a6e8942d7a1901e96 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 9 Feb 2017 16:23:23 +0100
Subject: [PATCH] Fix serving up the root welcome page

---
 server.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 68fbb9a..5814539 100755
--- a/server.js
+++ b/server.js
@@ -33,7 +33,12 @@ router.delete('/api/files/*', auth.verify, files.del);
 router.get   ('/api/healthcheck', function (req, res) { res.status(200).send(); });
 
 // welcome screen in case / does not serve up any file yet
-router.get('/', function (req, res) { res.status(200).sendFile(path.join(__dirname, '/frontend/welcome.html')); });
+function welcomePage(req, res, next) {
+    if (req.path !== '/') return next();
+
+    res.status(200).sendFile(path.join(__dirname, '/frontend/welcome.html'));
+}
+// router.get('/', function (req, res) { res.status(200).sendFile(path.join(__dirname, '/frontend/welcome.html')); });
 
 var rootFolder = path.resolve(__dirname, process.argv[2] || 'files');
 
@@ -48,6 +53,7 @@ app.use('/api', passport.session());
 app.use(router);
 app.use('/_admin', express.static(__dirname + '/frontend'));
 app.use('/', express.static(rootFolder));
+app.use('/', welcomePage);
 app.use('/', serveIndex(rootFolder, { icons: true }));
 app.use(lastMile());
 
-- 
2.41.0