fix(install): server crash due to invalid middleware

polonel · Nov 7, 2018 · 88367d9 · 88367d9
1 parent f01cf82
commit 88367d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/views/install.hbs b/src/views/install.hbs
@@ -29,6 +29,10 @@
             padding: 15px 0;
         }
 
+        h2 {
+            color: #444 !important;
+        }
+
         p {
             font-family: "Roboto", Arial, sans-serif;
             font-weight: 300;

diff --git a/src/webserver.js b/src/webserver.js
@@ -97,11 +97,11 @@ var async   = require('async'),
         app.set('view engine', 'hbs');
         hbsHelpers.register(hbs.handlebars);
 
-        app.use('/assets', express.static(nconf.get('base_dir') + '/public/uploads/assets'));
-        app.use('/uploads', middleware.redirectToLogin, express.static(nconf.get('base_dir') + '/public/uploads'));
+        app.use('/assets', express.static(path.join(__dirname, '../public/uploads/assets')));
+        app.use('/uploads', routeMiddleware.redirectToLogin, express.static(path.join(__dirname, '../public/uploads')));
 
-        app.use(express.static(nconf.get('base_dir') + '/public'));
-        app.use(favicon(nconf.get('base_dir') + '/public/img/favicon.ico'));
+        app.use(express.static(path.join(__dirname, '../public')));
+        app.use(favicon(path.join(__dirname, '../public/img/favicon.ico')));
         app.use(bodyParser.urlencoded({ extended: false }));
         app.use(bodyParser.json());