* Re: [pbs-devel] [PATCH proxmox-backup 15/15] basically a (semantic) revert of commit 991be99c37c6f55f43a3d9a2c54edb2a8dc6d4f2 "buildsys: workaround linkage issues from openid/curl build server stuff separate"
@ 2021-09-20 8:00 Dietmar Maurer
0 siblings, 0 replies; 2+ messages in thread
From: Dietmar Maurer @ 2021-09-20 8:00 UTC (permalink / raw)
To: pbs-devel; +Cc: Thomas Lamprecht
Oh, there is a missing backspace in the Makefile:
diff --git a/Makefile b/Makefile
index 212c3c24..ff0f73b4 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-
--bin proxmox-backup-api \
--bin proxmox-backup-proxy \
--bin proxmox-backup-manager \
- --bin docgen
+ --bin docgen \
--package proxmox-backup-banner \
--bin proxmox-backup-banner \
--package proxmox-backup-client \
> On 09/20/2021 9:38 AM Dietmar Maurer <dietmar@proxmox.com> wrote:
>
>
> This is no longer required because we moved proxmox_restore_daemon
> code into extra crate (commit 8d99394228939e9f8180efaa06672ecd696d1913)
>
> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
> ---
> Makefile | 3 +--
> src/api2/access/mod.rs | 12 ++----------
> 2 files changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 79e2dd7c..212c3c24 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -171,12 +171,11 @@ cargo-build:
>
> $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
> .do-cargo-build:
> - RUSTFLAGS="--cfg openid" $(CARGO) build $(CARGO_BUILD_ARGS) \
> + $(CARGO) build $(CARGO_BUILD_ARGS) \
> --bin proxmox-backup-api \
> --bin proxmox-backup-proxy \
> --bin proxmox-backup-manager \
> --bin docgen
> - $(CARGO) build $(CARGO_BUILD_ARGS) \
> --package proxmox-backup-banner \
> --bin proxmox-backup-banner \
> --package proxmox-backup-client \
> diff --git a/src/api2/access/mod.rs b/src/api2/access/mod.rs
> index 0d247288..ad898614 100644
> --- a/src/api2/access/mod.rs
> +++ b/src/api2/access/mod.rs
> @@ -27,13 +27,11 @@ use crate::config::tfa::TfaChallenge;
>
> pub mod acl;
> pub mod domain;
> +pub mod openid;
> pub mod role;
> pub mod tfa;
> pub mod user;
>
> -#[cfg(openid)]
> -pub mod openid;
> -
> #[allow(clippy::large_enum_variant)]
> enum AuthResult {
> /// Successful authentication which does not require a new ticket.
> @@ -413,12 +411,6 @@ pub fn list_permissions(
> Ok(map)
> }
>
> -#[cfg(openid)]
> -const OPENID_ROUTER: &Router = &openid::ROUTER;
> -
> -#[cfg(not(openid))]
> -const OPENID_ROUTER: &Router = &Router::new();
> -
> #[sortable]
> const SUBDIRS: SubdirMap = &sorted!([
> ("acl", &acl::ROUTER),
> @@ -428,7 +420,7 @@ const SUBDIRS: SubdirMap = &sorted!([
> &Router::new().get(&API_METHOD_LIST_PERMISSIONS)
> ),
> ("ticket", &Router::new().post(&API_METHOD_CREATE_TICKET)),
> - ("openid", &OPENID_ROUTER),
> + ("openid", &openid::ROUTER),
> ("domains", &domain::ROUTER),
> ("roles", &role::ROUTER),
> ("users", &user::ROUTER),
> --
> 2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pbs-devel] [PATCH proxmox-backup 01/15] start new pbs-server workspace
@ 2021-09-20 7:37 Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 15/15] basically a (semantic) revert of commit 991be99c37c6f55f43a3d9a2c54edb2a8dc6d4f2 "buildsys: workaround linkage issues from openid/curl build server stuff separate" Dietmar Maurer
0 siblings, 1 reply; 2+ messages in thread
From: Dietmar Maurer @ 2021-09-20 7:37 UTC (permalink / raw)
To: pbs-devel
---
Cargo.toml | 2 ++
Makefile | 1 +
pbs-server/Cargo.toml | 9 +++++++++
pbs-server/src/lib.rs | 0
4 files changed, 12 insertions(+)
create mode 100644 pbs-server/Cargo.toml
create mode 100644 pbs-server/src/lib.rs
diff --git a/Cargo.toml b/Cargo.toml
index 72d786c9..58abf7c6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,6 +26,7 @@ members = [
"pbs-datastore",
"pbs-fuse-loop",
"pbs-runtime",
+ "pbs-server",
"pbs-systemd",
"pbs-tape",
"pbs-tools",
@@ -107,6 +108,7 @@ pbs-client = { path = "pbs-client" }
pbs-config = { path = "pbs-config" }
pbs-datastore = { path = "pbs-datastore" }
pbs-runtime = { path = "pbs-runtime" }
+pbs-server = { path = "pbs-server" }
pbs-systemd = { path = "pbs-systemd" }
pbs-tools = { path = "pbs-tools" }
pbs-tape = { path = "pbs-tape" }
diff --git a/Makefile b/Makefile
index e6c85a2e..050218ba 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@ SUBCRATES := \
pbs-datastore \
pbs-fuse-loop \
pbs-runtime \
+ pbs-server \
pbs-systemd \
pbs-tape \
pbs-tools \
diff --git a/pbs-server/Cargo.toml b/pbs-server/Cargo.toml
new file mode 100644
index 00000000..e933c1e6
--- /dev/null
+++ b/pbs-server/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "pbs-server"
+version = "0.1.0"
+authors = ["Proxmox Support Team <support@proxmox.com>"]
+edition = "2018"
+description = "REST server implementation"
+
+[dependencies]
+anyhow = "1.0"
diff --git a/pbs-server/src/lib.rs b/pbs-server/src/lib.rs
new file mode 100644
index 00000000..e69de29b
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pbs-devel] [PATCH proxmox-backup 15/15] basically a (semantic) revert of commit 991be99c37c6f55f43a3d9a2c54edb2a8dc6d4f2 "buildsys: workaround linkage issues from openid/curl build server stuff separate"
2021-09-20 7:37 [pbs-devel] [PATCH proxmox-backup 01/15] start new pbs-server workspace Dietmar Maurer
@ 2021-09-20 7:38 ` Dietmar Maurer
0 siblings, 0 replies; 2+ messages in thread
From: Dietmar Maurer @ 2021-09-20 7:38 UTC (permalink / raw)
To: pbs-devel; +Cc: Dietmar Maurer, Thomas Lamprecht
This is no longer required because we moved proxmox_restore_daemon
code into extra crate (commit 8d99394228939e9f8180efaa06672ecd696d1913)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
---
Makefile | 3 +--
src/api2/access/mod.rs | 12 ++----------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 79e2dd7c..212c3c24 100644
--- a/Makefile
+++ b/Makefile
@@ -171,12 +171,11 @@ cargo-build:
$(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
.do-cargo-build:
- RUSTFLAGS="--cfg openid" $(CARGO) build $(CARGO_BUILD_ARGS) \
+ $(CARGO) build $(CARGO_BUILD_ARGS) \
--bin proxmox-backup-api \
--bin proxmox-backup-proxy \
--bin proxmox-backup-manager \
--bin docgen
- $(CARGO) build $(CARGO_BUILD_ARGS) \
--package proxmox-backup-banner \
--bin proxmox-backup-banner \
--package proxmox-backup-client \
diff --git a/src/api2/access/mod.rs b/src/api2/access/mod.rs
index 0d247288..ad898614 100644
--- a/src/api2/access/mod.rs
+++ b/src/api2/access/mod.rs
@@ -27,13 +27,11 @@ use crate::config::tfa::TfaChallenge;
pub mod acl;
pub mod domain;
+pub mod openid;
pub mod role;
pub mod tfa;
pub mod user;
-#[cfg(openid)]
-pub mod openid;
-
#[allow(clippy::large_enum_variant)]
enum AuthResult {
/// Successful authentication which does not require a new ticket.
@@ -413,12 +411,6 @@ pub fn list_permissions(
Ok(map)
}
-#[cfg(openid)]
-const OPENID_ROUTER: &Router = &openid::ROUTER;
-
-#[cfg(not(openid))]
-const OPENID_ROUTER: &Router = &Router::new();
-
#[sortable]
const SUBDIRS: SubdirMap = &sorted!([
("acl", &acl::ROUTER),
@@ -428,7 +420,7 @@ const SUBDIRS: SubdirMap = &sorted!([
&Router::new().get(&API_METHOD_LIST_PERMISSIONS)
),
("ticket", &Router::new().post(&API_METHOD_CREATE_TICKET)),
- ("openid", &OPENID_ROUTER),
+ ("openid", &openid::ROUTER),
("domains", &domain::ROUTER),
("roles", &role::ROUTER),
("users", &user::ROUTER),
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-20 8:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-20 8:00 [pbs-devel] [PATCH proxmox-backup 15/15] basically a (semantic) revert of commit 991be99c37c6f55f43a3d9a2c54edb2a8dc6d4f2 "buildsys: workaround linkage issues from openid/curl build server stuff separate" Dietmar Maurer
-- strict thread matches above, loose matches on Subject: below --
2021-09-20 7:37 [pbs-devel] [PATCH proxmox-backup 01/15] start new pbs-server workspace Dietmar Maurer
2021-09-20 7:38 ` [pbs-devel] [PATCH proxmox-backup 15/15] basically a (semantic) revert of commit 991be99c37c6f55f43a3d9a2c54edb2a8dc6d4f2 "buildsys: workaround linkage issues from openid/curl build server stuff separate" Dietmar Maurer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox