tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid injecting ENV vars from Makefile

Browse Source 
So that we can run "cargo build" without setting vars manually.
This commit is contained in:
Dietmar Maurer
2019-09-09 10:51:08 +02:00
parent d21ae955a6
commit 4a7de56e2f
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/proxmox-backup-api.rs
View File

@ -12,6 +12,7 @@ use proxmox_backup::server;
use proxmox_backup::tools::daemon;
use proxmox_backup::auth_helpers::*;
use proxmox_backup::config;
use proxmox_backup::buildcfg;
#[tokio::main]
async fn main() {
@ -48,7 +49,7 @@ async fn run() -> Result<(), Error> {
}
let config = ApiConfig::new(
env!("PROXMOX_JSDIR"), &ROUTER, RpcEnvironmentType::PRIVILEGED);
buildcfg::JS_DIR, &ROUTER, RpcEnvironmentType::PRIVILEGED);
let rest_server = RestServer::new(config);

3
src/bin/proxmox-backup-proxy.rs
View File

@ -1,4 +1,5 @@
use proxmox_backup::configdir;
use proxmox_backup::buildcfg;
use proxmox_backup::server;
use proxmox_backup::tools::daemon;
use proxmox_backup::api_schema::router::*;
@ -41,7 +42,7 @@ async fn run() -> Result<(), Error> {
}
let mut config = ApiConfig::new(
env!("PROXMOX_JSDIR"), &ROUTER, RpcEnvironmentType::PUBLIC);
buildcfg::JS_DIR, &ROUTER, RpcEnvironmentType::PUBLIC);
// add default dirs which includes jquery and bootstrap
// my $base = '/usr/share/libpve-http-server-perl';