From 8adbdb0a54fc14b19d1d1d225f0ccee80b57b7e7 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Sat, 1 Dec 2018 15:21:25 +0100 Subject: [PATCH] fix file download, listen to 0.0.0.0 --- debian/install | 2 ++ src/api/config.rs | 2 ++ src/api/server.rs | 16 ++++++++-------- src/bin/api-test-server.rs | 4 ++-- www/images/logo-128.png | Bin 0 -> 4977 bytes www/images/proxmox_logo.png | Bin 0 -> 2809 bytes 6 files changed, 14 insertions(+), 10 deletions(-) create mode 100755 www/images/logo-128.png create mode 100644 www/images/proxmox_logo.png diff --git a/debian/install b/debian/install index 91b7d9b8..2f54f235 100644 --- a/debian/install +++ b/debian/install @@ -1 +1,3 @@ target/release/api-test-server /usr/sbin +www/images/logo-128.png /usr/share/javascript/proxmox-backup-server/images/ +www/images/proxmox_logo.png /usr/share/javascript/proxmox-backup-server/images/ diff --git a/src/api/config.rs b/src/api/config.rs index d390ed0a..b0908421 100644 --- a/src/api/config.rs +++ b/src/api/config.rs @@ -48,6 +48,8 @@ impl ApiConfig { if let Some(subdir) = self.aliases.get(&prefix) { filename.push(subdir); for i in 1..comp_len { filename.push(components[i]) } + } else { + for i in 0..comp_len { filename.push(components[i]) } } } filename diff --git a/src/api/server.rs b/src/api/server.rs index 07542921..a8ed1ab7 100644 --- a/src/api/server.rs +++ b/src/api/server.rs @@ -223,23 +223,23 @@ fn get_index() -> BoxFut { Proxmox Backup Server - + - - + + - - + + - - + + - + diff --git a/src/bin/api-test-server.rs b/src/bin/api-test-server.rs index d8d3d3c5..67e83c09 100644 --- a/src/bin/api-test-server.rs +++ b/src/bin/api-test-server.rs @@ -64,13 +64,13 @@ fn main() { }, } - let addr = ([127, 0, 0, 1], 8007).into(); + let addr = ([0, 0, 0, 0], 8007).into(); lazy_static!{ static ref ROUTER: Router = apitest::api3::router(); } - let mut config = ApiConfig::new("/var/www", &ROUTER); + let mut config = ApiConfig::new("/usr/share/javascript/proxmox-backup-server", &ROUTER); // add default dirs which includes jquery and bootstrap // my $base = '/usr/share/libpve-http-server-perl'; diff --git a/www/images/logo-128.png b/www/images/logo-128.png new file mode 100755 index 0000000000000000000000000000000000000000..7a01d37a35d77b4bb4449e7113cebe8d7f8451b2 GIT binary patch literal 4977 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 LNkvXXu0mjf(O4xe literal 0 HcmV?d00001