diff --git a/Cargo.toml b/Cargo.toml index fbea3dc6..ac861715 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "apitest" +name = "proxmox-backup" version = "0.1.0" authors = ["Dietmar Maurer "] edition = "2018" [lib] -name = "apitest" +name = "proxmox_backup" path = "src/lib.rs" version = "0.1.0" authors = ["Dietmar Maurer "] diff --git a/Makefile b/Makefile index 627f84b6..dbe8c417 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PACKAGE=api-test-server +PACKAGE=proxmox-backup PKGVER=0.1 PKGREL=1 diff --git a/debian/changelog b/debian/changelog index 18c5e33b..dd39a099 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -rust-api-test-server (0.1-1) unstable; urgency=medium +proxmox-backup (0.1-1) unstable; urgency=medium [ Proxmox Support Team ] * first try diff --git a/debian/control b/debian/control index e0229f84..0a9d9fcb 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: rust-api-test-server +Source: proxmox-backup Section: admin Priority: optional Maintainer: Proxmox Support Team @@ -6,11 +6,11 @@ Build-Depends: debhelper (>= 10), Standards-Version: 3.9.5 Homepage: https://www.proxmox.com -Package: api-test-server +Package: proxmox-backup Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-extjs (>= 6.0.1), fonts-font-awesome, proxmox-widget-toolkit, -Description: API Test Server +Description: Proxmox Backup Server This is experimental code used to test Rust. diff --git a/debian/install b/debian/install index f447ef60..5698815b 100644 --- a/debian/install +++ b/debian/install @@ -1,7 +1,6 @@ -target/release/api-test-server /usr/sbin +target/release/proxmox-backup-api /usr/sbin target/release/pbs /usr/sbin target/release/backup-client /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/ -www/proxmox-backup-gui.js /usr/share/javascript/proxmox-backup-server/js/ - +www/images/logo-128.png /usr/share/javascript/proxmox-backup/images/ +www/images/proxmox_logo.png /usr/share/javascript/proxmox-backup/images/ +www/proxmox-backup-gui.js /usr/share/javascript/proxmox-backup/js/ diff --git a/debian/api-test-server.bash-completion b/debian/proxmox-backup.bash-completion similarity index 100% rename from debian/api-test-server.bash-completion rename to debian/proxmox-backup.bash-completion diff --git a/debian/api-test-server.service b/debian/proxmox-backup.service similarity index 63% rename from debian/api-test-server.service rename to debian/proxmox-backup.service index bf1c3b1b..38964b31 100644 --- a/debian/api-test-server.service +++ b/debian/proxmox-backup.service @@ -1,11 +1,11 @@ [Unit] Description=Proxmox API Test Server -ConditionPathExists=/usr/sbin/api-test-server +ConditionPathExists=/usr/sbin/proxmox-backup-api After=syslog.service After=network.target [Service] -ExecStart=/usr/sbin/api-test-server start +ExecStart=/usr/sbin/proxmox-backup-api start Type=simple Restart=on-failure diff --git a/src/bin/backup-client.rs b/src/bin/backup-client.rs index cb4be410..9ed931c4 100644 --- a/src/bin/backup-client.rs +++ b/src/bin/backup-client.rs @@ -1,19 +1,18 @@ -extern crate apitest; +extern crate proxmox_backup; use failure::*; use std::os::unix::io::AsRawFd; -use apitest::tools; -use apitest::cli::command::*; -use apitest::api::schema::*; -use apitest::api::router::*; -//use apitest::backup::chunk_store::*; -//use apitest::backup::image_index::*; -//use apitest::config::datastore; -use apitest::backup::datastore::*; +use proxmox_backup::tools; +use proxmox_backup::cli::command::*; +use proxmox_backup::api::schema::*; +use proxmox_backup::api::router::*; +//use proxmox_backup::backup::chunk_store::*; +//use proxmox_backup::backup::image_index::*; +//use proxmox_backup::config::datastore; +use proxmox_backup::backup::datastore::*; use serde_json::{Value}; - fn required_string_param<'a>(param: &'a Value, name: &str) -> &'a str { param[name].as_str().expect(&format!("missing parameter '{}'", name)) } @@ -65,7 +64,7 @@ fn main() { .required("store", StringSchema::new("Datastore name.")) )) .arg_param(vec!["filename"]) - .completion_cb("store", apitest::config::datastore::complete_datastore_name); + .completion_cb("store", proxmox_backup::config::datastore::complete_datastore_name); if let Err(err) = run_cli_command(&cmd_def.into()) { diff --git a/src/bin/pbs.rs b/src/bin/pbs.rs index e0a1be9d..2982a25e 100644 --- a/src/bin/pbs.rs +++ b/src/bin/pbs.rs @@ -1,11 +1,11 @@ -extern crate apitest; +extern crate proxmox_backup; -//use apitest::api3; -use apitest::cli::command::*; +//use proxmox_backup::api3; +use proxmox_backup::cli::command::*; fn datastore_commands() -> CommandLineInterface { - use apitest::api3::config::datastore; + use proxmox_backup::api3::config::datastore; let cmd_def = CliCommandMap::new() .insert("list", CliCommand::new(datastore::get()).into()) @@ -16,7 +16,7 @@ fn datastore_commands() -> CommandLineInterface { .insert("remove", CliCommand::new(datastore::delete()) .arg_param(vec!["name"]) - .completion_cb("name", apitest::config::datastore::complete_datastore_name) + .completion_cb("name", proxmox_backup::config::datastore::complete_datastore_name) .into()); cmd_def.into() diff --git a/src/bin/api-test-server.rs b/src/bin/proxmox-backup-api.rs similarity index 89% rename from src/bin/api-test-server.rs rename to src/bin/proxmox-backup-api.rs index 0c0b199b..84dd7f66 100644 --- a/src/bin/api-test-server.rs +++ b/src/bin/proxmox-backup-api.rs @@ -1,12 +1,12 @@ -extern crate apitest; +extern crate proxmox_backup; use std::sync::Arc; -use apitest::api::schema::*; -use apitest::api::router::*; -use apitest::api::config::*; -use apitest::server::rest::*; -use apitest::getopts; +use proxmox_backup::api::schema::*; +use proxmox_backup::api::router::*; +use proxmox_backup::api::config::*; +use proxmox_backup::server::rest::*; +use proxmox_backup::getopts; //use failure::*; use lazy_static::lazy_static; @@ -67,10 +67,10 @@ fn main() { let addr = ([0, 0, 0, 0], 8007).into(); lazy_static!{ - static ref ROUTER: Router = apitest::api3::router(); + static ref ROUTER: Router = proxmox_backup::api3::router(); } - let mut config = ApiConfig::new("/usr/share/javascript/proxmox-backup-server", &ROUTER); + let mut config = ApiConfig::new("/usr/share/javascript/proxmox-backup", &ROUTER); // add default dirs which includes jquery and bootstrap // my $base = '/usr/share/libpve-http-server-perl';