diff options
| -rw-r--r-- | .htaccess | 3 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | license-generator/src/database.rs | 5 | ||||
| -rw-r--r-- | license-generator/src/logger.rs | 4 |
4 files changed, 7 insertions, 12 deletions
@@ -1,6 +1,3 @@ -SetEnv LOG_FILE "license_generator.log" -SetEnv DATABASE_URL "mysql://localhost:3306/dome_key" - ErrorDocument 404 /404.html @@ -13,7 +13,7 @@ internal_error.html: internal_error.in.html # Compile binaries for Linux license-generator/target/release/fulfillment \ -license-generator/target/release/license: +license-generator/target/release/license: production-config/env docker run \ --rm \ --interactive \ @@ -21,7 +21,10 @@ license-generator/target/release/license: --volume $$PWD/license-generator:/app \ --workdir /app \ rust:1.30.1-trusty \ - cargo build --release + bash -c " \ + source ../production-config/env; \ + cargo build --release \ + " .PHONY: deploy deploy: license-generator/target/release/fulfillment \ diff --git a/license-generator/src/database.rs b/license-generator/src/database.rs index 478c97e..85683e9 100644 --- a/license-generator/src/database.rs +++ b/license-generator/src/database.rs @@ -1,12 +1,9 @@ -use std::env; - use mysql; use errors::*; pub fn get_database_pool() -> Result<mysql::Pool> { - let connection_url = env::var("DATABASE_URL") - .chain_err(|| "DATABASE_URL environment variable not found")?; + let connection_url = env!("DATABASE_URL"); let pool = mysql::Pool::new_manual(4, 15, connection_url)?; Ok(pool) diff --git a/license-generator/src/logger.rs b/license-generator/src/logger.rs index 1b6e07b..d286808 100644 --- a/license-generator/src/logger.rs +++ b/license-generator/src/logger.rs @@ -1,4 +1,3 @@ -use std::env; use std::fs::OpenOptions; use fastcgi; @@ -7,8 +6,7 @@ use simplelog::{Config, LevelFilter, WriteLogger}; use errors::*; pub fn init() -> Result<()> { - let log_file_path = env::var("LOG_FILE") - .chain_err(|| "LOG_FILE environment variable not found")?; + let log_file_path = env!("LOG_FILE"); let log_file = OpenOptions::new() .append(true) |