From 9d7acccaeecbfc6c820050e116ba15c03838666e Mon Sep 17 00:00:00 2001 From: Shane Tomlinson Date: Wed, 11 Dec 2013 18:02:01 +0000 Subject: [PATCH] Consistency changes: * STATIC_ROOT => STATIC_DIRECTORY to match the configuration variable name. * Update local.json-dist to declare static_directory --- server/bin/fxa-content-server.js | 4 ++-- server/config/local.json-dist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/bin/fxa-content-server.js b/server/bin/fxa-content-server.js index ce3619777..a90d2bb28 100755 --- a/server/bin/fxa-content-server.js +++ b/server/bin/fxa-content-server.js @@ -22,7 +22,7 @@ const routes = require('../lib/routes'); // Side effect - Adds default_fxa and dev_fxa to express.logger formats const routeLogging = require('../lib/logging/route_logging'); -const STATIC_ROOT = +const STATIC_DIRECTORY = path.join(__dirname, '..', '..', config.get('static_directory')); const VIEWS_ROOT = path.join(__dirname, '..', 'views'); @@ -40,7 +40,7 @@ function makeApp() { routes(app); - app.use(express.static(STATIC_ROOT)); + app.use(express.static(STATIC_DIRECTORY)); return app; } diff --git a/server/config/local.json-dist b/server/config/local.json-dist index 03979684a..050a7c262 100644 --- a/server/config/local.json-dist +++ b/server/config/local.json-dist @@ -9,5 +9,5 @@ "use_https": false, "supported_languages": ["en-US"], "route_log_format": "dev_fxa", - "static_root": "app" + "static_directory": "app" }