martin/freeswitch_chris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move env file to etc folder

Browse Source
This commit is contained in:
Martin Yang
2026-04-02 00:08:38 -04:00
parent 6a720f7364
commit 36629ab436
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
did_router/src/database.rs
View File

@@ -1,8 +1,9 @@
use diesel::prelude::*; use diesel::prelude::*;
use diesel::pg::PgConnection; use diesel::pg::PgConnection;
use diesel::result::Error; use diesel::result::Error;
use dotenvy::dotenv; use dotenvy::{from_path};
use std::env; use std::env;
use std::path::Path;
use serde::{Serialize}; use serde::{Serialize};
use diesel_derive_enum::DbEnum; use diesel_derive_enum::DbEnum;
use std::str::FromStr; use std::str::FromStr;
@@ -49,7 +50,8 @@ pub struct NewDid<'a> {
} }
pub fn connect() -> PgConnection { pub fn connect() -> PgConnection {
dotenv().ok(); let env_path = Path::new("/etc/did_router.conf");
from_path(env_path).expect("env file missed");
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set"); let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
PgConnection::establish(&database_url) PgConnection::establish(&database_url)

11
did_router/src/httapi.rs
View File

@@ -1,5 +1,6 @@
use dotenvy::dotenv; use dotenvy::{from_path};
use std::env; use std::env;
use std::path::Path;
use xml_builder::{XMLBuilder, XMLElement, XMLVersion}; use xml_builder::{XMLBuilder, XMLElement, XMLVersion};
use super::database as db; use super::database as db;
use super::database::{DidTargetType, Did}; use super::database::{DidTargetType, Did};
@@ -42,7 +43,9 @@ pub fn external_number(did: Did) -> XMLElement {
} }
pub fn no_service(_did: Did) -> XMLElement { pub fn no_service(_did: Did) -> XMLElement {
dotenv().ok(); let env_path = Path::new("/etc/did_router.conf");
from_path(env_path).expect("env file missed");
let sound_path = env::var("SOUND_PATH").expect("SOUND_PATH must be set"); let sound_path = env::var("SOUND_PATH").expect("SOUND_PATH must be set");
let no_service_path = format!("{}/no_service.wav", sound_path); let no_service_path = format!("{}/no_service.wav", sound_path);
let mut work = XMLElement::new("work"); let mut work = XMLElement::new("work");
@@ -53,7 +56,9 @@ pub fn no_service(_did: Did) -> XMLElement {
} }
pub fn night_mode(_did: Did) -> XMLElement { pub fn night_mode(_did: Did) -> XMLElement {
dotenv().ok(); let env_path = Path::new("/etc/did_router.conf");
from_path(env_path).expect("env file missed");
let sound_path = env::var("SOUND_PATH").expect("SOUND_PATH must be set"); let sound_path = env::var("SOUND_PATH").expect("SOUND_PATH must be set");
let night_mode_path = format!("{}/night_mode.wav", sound_path); let night_mode_path = format!("{}/night_mode.wav", sound_path);