diff --git a/pbs-api-types/Cargo.toml b/pbs-api-types/Cargo.toml index 585bb9c6..4b188c07 100644 --- a/pbs-api-types/Cargo.toml +++ b/pbs-api-types/Cargo.toml @@ -18,7 +18,5 @@ serde = { version = "1.0", features = ["derive"] } proxmox = "0.15.0" proxmox-lang = "1.0.0" proxmox-schema = { version = "1.0.1", features = [ "api-macro" ] } -proxmox-time = "1.0.0" +proxmox-time = "1.1" proxmox-uuid = { version = "1.0.0", features = [ "serde" ] } - -proxmox-systemd = { path = "../proxmox-systemd" } diff --git a/pbs-api-types/src/jobs.rs b/pbs-api-types/src/jobs.rs index f47a294a..66a8d180 100644 --- a/pbs-api-types/src/jobs.rs +++ b/pbs-api-types/src/jobs.rs @@ -23,25 +23,25 @@ pub const JOB_ID_SCHEMA: Schema = StringSchema::new("Job ID.") pub const SYNC_SCHEDULE_SCHEMA: Schema = StringSchema::new( "Run sync job at specified schedule.") - .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event)) + .format(&ApiStringFormat::VerifyFn(proxmox_time::verify_calendar_event)) .type_text("") .schema(); pub const GC_SCHEDULE_SCHEMA: Schema = StringSchema::new( "Run garbage collection job at specified schedule.") - .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event)) + .format(&ApiStringFormat::VerifyFn(proxmox_time::verify_calendar_event)) .type_text("") .schema(); pub const PRUNE_SCHEDULE_SCHEMA: Schema = StringSchema::new( "Run prune job at specified schedule.") - .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event)) + .format(&ApiStringFormat::VerifyFn(proxmox_time::verify_calendar_event)) .type_text("") .schema(); pub const VERIFICATION_SCHEDULE_SCHEMA: Schema = StringSchema::new( "Run verify job at specified schedule.") - .format(&ApiStringFormat::VerifyFn(proxmox_systemd::time::verify_calendar_event)) + .format(&ApiStringFormat::VerifyFn(proxmox_time::verify_calendar_event)) .type_text("") .schema(); diff --git a/pbs-api-types/src/lib.rs b/pbs-api-types/src/lib.rs index eebf5794..01c14cc4 100644 --- a/pbs-api-types/src/lib.rs +++ b/pbs-api-types/src/lib.rs @@ -7,7 +7,7 @@ use proxmox_schema::{ api, const_regex, ApiStringFormat, ApiType, ArraySchema, Schema, StringSchema, ReturnType, }; use proxmox::{IPRE, IPRE_BRACKET, IPV4OCTET, IPV4RE, IPV6H16, IPV6LS32, IPV6RE}; -use proxmox_systemd::daily_duration::parse_daily_duration; +use proxmox_time::parse_daily_duration; #[rustfmt::skip] #[macro_export] diff --git a/pbs-api-types/src/tape/media_pool.rs b/pbs-api-types/src/tape/media_pool.rs index 148ae051..3b1cb0f5 100644 --- a/pbs-api-types/src/tape/media_pool.rs +++ b/pbs-api-types/src/tape/media_pool.rs @@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize}; use proxmox_schema::{api, Schema, StringSchema, ApiStringFormat, Updater}; -use proxmox_systemd::time::{parse_calendar_event, parse_time_span, CalendarEvent, TimeSpan}; +use proxmox_time::{parse_calendar_event, parse_time_span, CalendarEvent, TimeSpan}; use crate::{ PROXMOX_SAFE_ID_FORMAT,