Dynamically use HOSTNAME in welcome screen

diff --git a/app.js b/app.js
index c0aec52fe7bf1ddbb02acd161a5296bc54cef6a4..7d5258f11c2fbc14053a60685e2472af98b32533 100755 (executable)
--- a/app.js
+++ b/app.js
@@ -7,6 +7,8 @@ var express = require('express'),
     morgan = require('morgan'),
     passport = require('passport'),
     path = require('path'),
+    ejs = require('ejs'),
+    fs = require('fs'),
     compression = require('compression'),
     session = require('express-session'),
     bodyParser = require('body-parser'),
@@ -25,8 +27,9 @@ router.get('/api/files/*', auth.ldap, files.get);
 router.put('/api/files/*', auth.ldap, multipart, files.put);
 router.delete('/api/files/*', auth.ldap, files.del);
 
-// healthcheck in case / does not serve up any file yet
-router.get('/', function (req, res) { res.sendFile(path.join(__dirname, '/app/welcome.html')); });
+// welcome screen in case / does not serve up any file yet
+var appUrl = process.env.HOSTNAME ? 'https://' + process.env.HOSTNAME : 'http://localhost:3000';
+router.get('/', function (req, res) { res.status(200).send(ejs.render(fs.readFileSync(path.join(__dirname, '/app/welcome.html'), 'utf8'), { appUrl: appUrl })); });
 
 app.use(morgan('dev'));
 app.use(compression());

diff --git a/app/welcome.html b/app/welcome.html
index 3fd2ed80aac7b5e6b1bdcae67a8cd3d04a7b8d14..9d3fa258d6064ffb6cff6265f6ea980df4409895 100644 (file)
--- a/app/welcome.html
+++ b/app/welcome.html
@@ -17,7 +17,7 @@
         </p>
         <pre>
 npm -g install cloudron-surfer
-surfer login http://test-foobar
+surfer login <%= appUrl %>
 surfer put [file]</pre>
         <br/>
         <br/>

diff --git a/src/files.js b/src/files.js
index c725e4bac5e6a22882defcaac083ca5e632d9fcb..3b28d3ff31d6e3fd6378338001df8c9bd34f9dd9 100644 (file)
--- a/src/files.js
+++ b/src/files.js
@@ -2,7 +2,6 @@
 
 var fs = require('fs'),
     path = require('path'),
-    ejs = require('ejs'),
     rm = require('del'),
     debug = require('debug')('files'),
     mkdirp = require('mkdirp'),
@@ -54,10 +53,6 @@ function copyFile(source, target, cb) {
     });
 }
 
-function render(view, options) {
-    return ejs.render(fs.readFileSync(view, 'utf8'), options);
-}
-
 function getAbsolutePath(filePath) {
     var absoluteFilePath = path.resolve(gBasePath, filePath);