use proxmox-backup as package name

diff --git a/Cargo.toml b/Cargo.toml
index fbea3dc68498872fab082902d9d9f1aa20477ab3..ac861715cfb83ce7123d02a73538a38833e26dc2 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "apitest"
+name = "proxmox-backup"
 version = "0.1.0"
 authors = ["Dietmar Maurer <dietmar@proxmox.com>"]
 edition = "2018"
 
 [lib]
-name = "apitest"
+name = "proxmox_backup"
 path = "src/lib.rs"
 version = "0.1.0"
 authors = ["Dietmar Maurer <dietmar@proxmox.com>"]

diff --git a/Makefile b/Makefile
index 627f84b639e3c2bb57f79fedfe0cb7670b72b27f..dbe8c417e69a6639b9e51a7a7050ecaaa2b9b572 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PACKAGE=api-test-server
+PACKAGE=proxmox-backup
 PKGVER=0.1
 PKGREL=1
 

diff --git a/debian/api-test-server.bash-completion b/debian/api-test-server.bash-completion
deleted file mode 100644 (file)
index 666f1c0..0000000
--- a/debian/api-test-server.bash-completion
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/pbs.bash-completion pbs
-debian/backup-client.bash-completion backup-client

diff --git a/debian/api-test-server.service b/debian/api-test-server.service
deleted file mode 100644 (file)
index bf1c3b1..0000000
--- a/debian/api-test-server.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Proxmox API Test Server
-ConditionPathExists=/usr/sbin/api-test-server
-After=syslog.service
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/api-test-server start
-Type=simple
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target

diff --git a/debian/changelog b/debian/changelog
index 18c5e33bd3ed5f1c83a1314ca58a1f0f533fd699..dd39a099186c554f495a47d8e6caffde8e2bf5ae 100644 (file)
--- 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 e0229f84192a8ce5ad19d8c41feb71b0ef5b1535..0a9d9fcb00893650ac8ee4339838073a088a4b20 100644 (file)
--- 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 <support@proxmox.com>
@@ -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 f447ef6063c6a4beb5c09808a3805a2b40f1119e..5698815be8d8a93e13e482be9500fd9cbf2501d8 100644 (file)
--- 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/proxmox-backup.bash-completion b/debian/proxmox-backup.bash-completion
new file mode 100644 (file)
index 0000000..666f1c0
--- /dev/null
+++ b/debian/proxmox-backup.bash-completion
@@ -0,0 +1,2 @@
+debian/pbs.bash-completion pbs
+debian/backup-client.bash-completion backup-client

diff --git a/debian/proxmox-backup.service b/debian/proxmox-backup.service
new file mode 100644 (file)
index 0000000..38964b3
--- /dev/null
+++ b/debian/proxmox-backup.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Proxmox API Test Server
+ConditionPathExists=/usr/sbin/proxmox-backup-api
+After=syslog.service
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/proxmox-backup-api start
+Type=simple
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

diff --git a/src/bin/api-test-server.rs b/src/bin/api-test-server.rs
deleted file mode 100644 (file)
index 0c0b199..0000000
--- a/src/bin/api-test-server.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-extern crate apitest;
-
-use std::sync::Arc;
-
-use apitest::api::schema::*;
-use apitest::api::router::*;
-use apitest::api::config::*;
-use apitest::server::rest::*;
-use apitest::getopts;
-
-//use failure::*;
-use lazy_static::lazy_static;
-
-use futures::future::Future;
-
-use hyper;
-
-fn main() {
-
-    let command : Arc<Schema> = StringSchema::new("Command.")
-        .format(Arc::new(ApiStringFormat::Enum(vec![
-            "start".into(),
-            "status".into(),
-            "stop".into()
-        ])))
-        .into();
-
-    let schema = ObjectSchema::new("Parameters.")
-        .required("command", command);
-
-    let args: Vec<String> = std::env::args().skip(1).collect();
-
-    let options = match getopts::parse_arguments(&args, &vec!["command"], &schema) {
-        Ok((options, rest)) => {
-            if !rest.is_empty() {
-                eprintln!("Error: got additional arguments: {:?}", rest);
-                std::process::exit(-1);
-            }
-            options
-        }
-        Err(err) => {
-            eprintln!("Error: unable to parse arguments:\n{}", err);
-            std::process::exit(-1);
-        }
-    };
-
-    let command = options["command"].as_str().unwrap();
-
-    match command {
-        "start" => {
-            println!("Starting server.");
-        },
-        "stop" => {
-            println!("Stopping server.");
-            std::process::exit(0);
-        },
-        "status" => {
-            println!("Server status.");
-             std::process::exit(0);
-       },
-        _ => {
-            eprintln!("got unexpected command {}", command);
-            std::process::exit(-1);
-        },
-    }
-
-    let addr = ([0, 0, 0, 0], 8007).into();
-
-    lazy_static!{
-       static ref ROUTER: Router = apitest::api3::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';
-    // add_dirs($self->{dirs}, '/css/' => "$base/css/");
-    // add_dirs($self->{dirs}, '/js/' => "$base/js/");
-    // add_dirs($self->{dirs}, '/fonts/' => "$base/fonts/");
-    config.add_alias("novnc", "/usr/share/novnc-pve");
-    config.add_alias("extjs", "/usr/share/javascript/extjs");
-    config.add_alias("fontawesome", "/usr/share/fonts-font-awesome");
-    config.add_alias("xtermjs", "/usr/share/pve-xtermjs");
-    config.add_alias("widgettoolkit", "/usr/share/javascript/proxmox-widget-toolkit");
-
-    let rest_server = RestServer::new(config);
-
-    let server = hyper::Server::bind(&addr)
-        .serve(rest_server)
-        .map_err(|e| eprintln!("server error: {}", e));
-
-
-    // Run this server for... forever!
-    hyper::rt::run(server);
-}

diff --git a/src/bin/backup-client.rs b/src/bin/backup-client.rs
index cb4be410531e1d8d2069160e24971b848773f307..9ed931c4fa6b95399e31a3728530427e6d05fff2 100644 (file)
--- 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 e0a1be9d0c59510bc4b51f4d3e5372a5b577acd2..2982a25ec40c16f05c3ac1e76f9658d4cfc791b7 100644 (file)
--- 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/proxmox-backup-api.rs b/src/bin/proxmox-backup-api.rs
new file mode 100644 (file)
index 0000000..84dd7f6
--- /dev/null
+++ b/src/bin/proxmox-backup-api.rs
@@ -0,0 +1,95 @@
+extern crate proxmox_backup;
+
+use std::sync::Arc;
+
+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;
+
+use futures::future::Future;
+
+use hyper;
+
+fn main() {
+
+    let command : Arc<Schema> = StringSchema::new("Command.")
+        .format(Arc::new(ApiStringFormat::Enum(vec![
+            "start".into(),
+            "status".into(),
+            "stop".into()
+        ])))
+        .into();
+
+    let schema = ObjectSchema::new("Parameters.")
+        .required("command", command);
+
+    let args: Vec<String> = std::env::args().skip(1).collect();
+
+    let options = match getopts::parse_arguments(&args, &vec!["command"], &schema) {
+        Ok((options, rest)) => {
+            if !rest.is_empty() {
+                eprintln!("Error: got additional arguments: {:?}", rest);
+                std::process::exit(-1);
+            }
+            options
+        }
+        Err(err) => {
+            eprintln!("Error: unable to parse arguments:\n{}", err);
+            std::process::exit(-1);
+        }
+    };
+
+    let command = options["command"].as_str().unwrap();
+
+    match command {
+        "start" => {
+            println!("Starting server.");
+        },
+        "stop" => {
+            println!("Stopping server.");
+            std::process::exit(0);
+        },
+        "status" => {
+            println!("Server status.");
+             std::process::exit(0);
+       },
+        _ => {
+            eprintln!("got unexpected command {}", command);
+            std::process::exit(-1);
+        },
+    }
+
+    let addr = ([0, 0, 0, 0], 8007).into();
+
+    lazy_static!{
+       static ref ROUTER: Router = proxmox_backup::api3::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';
+    // add_dirs($self->{dirs}, '/css/' => "$base/css/");
+    // add_dirs($self->{dirs}, '/js/' => "$base/js/");
+    // add_dirs($self->{dirs}, '/fonts/' => "$base/fonts/");
+    config.add_alias("novnc", "/usr/share/novnc-pve");
+    config.add_alias("extjs", "/usr/share/javascript/extjs");
+    config.add_alias("fontawesome", "/usr/share/fonts-font-awesome");
+    config.add_alias("xtermjs", "/usr/share/pve-xtermjs");
+    config.add_alias("widgettoolkit", "/usr/share/javascript/proxmox-widget-toolkit");
+
+    let rest_server = RestServer::new(config);
+
+    let server = hyper::Server::bind(&addr)
+        .serve(rest_server)
+        .map_err(|e| eprintln!("server error: {}", e));
+
+
+    // Run this server for... forever!
+    hyper::rt::run(server);
+}