From 7125fc954de1bb85ab681925e90dc7e78dc3fa8a Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 7 Mar 2021 23:55:38 -0800 Subject: [PATCH] =?UTF-8?q?=E2=9E=95=20SERVER=5FPROTOCOL=20is=20now=20an?= =?UTF-8?q?=20official=20env=20variable=20for=20the=20json-api=20to=20read?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- json-api/.env | 1 + json-api/src/meta.rs | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/json-api/.env b/json-api/.env index 22f6ee9..c9dd33f 100644 --- a/json-api/.env +++ b/json-api/.env @@ -12,3 +12,4 @@ SERVER_NAME="Freechat Dev Server" SERVER_DESCRIPTION="Server for sick development things" SERVER_HOSTNAME=localhost SERVER_PORT=4536 +SERVER_PROTOCOL=http diff --git a/json-api/src/meta.rs b/json-api/src/meta.rs index 349b97d..5f3f873 100644 --- a/json-api/src/meta.rs +++ b/json-api/src/meta.rs @@ -10,7 +10,8 @@ pub struct Config { pub name: String, pub description: String, pub hostname: String, - pub port: u16 + pub port: u16, + pub protocol: String, } pub fn get_config() -> Config { @@ -19,6 +20,7 @@ pub fn get_config() -> Config { description: var("SERVER_DESCRIPTION").unwrap_or("No description".into()), hostname: var("SERVER_HOSTNAME").expect("Couldn't get url from environment"), port: var("SERVER_PORT").expect("Couldn't get port from environment").parse::().unwrap(), + protocol: var("SERVER_PROTOCOL").expect("Couldn't get protocol from environment") } }