From 8678f92c5d0664e27652fb211df52341227e6a1f Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 20 Feb 2019 18:35:27 -0800 Subject: [PATCH] Creating a better env strategy. --- server/service/src/main.rs | 2 +- server/ui/.gitignore | 2 ++ server/ui/set_env.js | 18 ++++++------------ server/ui/src/env.ts | 1 - 4 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 server/ui/src/env.ts diff --git a/server/service/src/main.rs b/server/service/src/main.rs index 0dcfc25..578939f 100644 --- a/server/service/src/main.rs +++ b/server/service/src/main.rs @@ -25,7 +25,7 @@ fn main() { // .index_file("index.html"), ) .finish() - }).bind("0.0.0.0:8080") + }).bind("localhost:8080") .unwrap() .run(); } diff --git a/server/ui/.gitignore b/server/ui/.gitignore index 07d46bc..ac08e3e 100644 --- a/server/ui/.gitignore +++ b/server/ui/.gitignore @@ -27,3 +27,5 @@ test/data/result.json package-lock.json *.orig + +src/env.ts diff --git a/server/ui/set_env.js b/server/ui/set_env.js index c4f5966..73734e0 100644 --- a/server/ui/set_env.js +++ b/server/ui/set_env.js @@ -2,16 +2,10 @@ require('dotenv').config(); const fs = require('fs'); exports.setEnv = function() { - if (process.env.TORRENTS_CSV_ENDPOINT) { - let env_line = `export const endpoint = '${process.env.TORRENTS_CSV_ENDPOINT}';`; - fs.writeFile("src/env.ts", env_line, function (err) { - if (err) { - return console.log(err); - } - console.log("Found $TORRENTS_CSV_ENDPOINT, wrote src/env.ts"); - console.log("\t" + env_line); - }); - } else { - console.log("No $TORRENTS_CSV_ENDPOINT environment variable set, using http://0.0.0.0:8080"); - } + let endpoint = (process.env.TORRENTS_CSV_ENDPOINT) ? process.env.TORRENTS_CSV_ENDPOINT : "http://localhost:8080"; + let env_line = `export const endpoint = '${endpoint}';`; + fs.writeFile("src/env.ts", env_line, function (err) { + console.log("Wrote src/env.ts:"); + console.log("\t" + env_line); + }); } diff --git a/server/ui/src/env.ts b/server/ui/src/env.ts deleted file mode 100644 index 00834bb..0000000 --- a/server/ui/src/env.ts +++ /dev/null @@ -1 +0,0 @@ -export const endpoint = 'http://0.0.0.0:8080'; \ No newline at end of file