clearer idea?
This commit is contained in:
1 parent
c2ae0f3d25
commit
66c9d139dc
8 files changed
+66
-27
No files matched your search
@@ -12,8 +12,7 @@ use crate::state;
|
||||
pub async fn issue_enroll_token(args: IssueEnrollTokenArgs) -> Result<()> {
|
||||
let settings = config::resolve_issue_token_settings(&args)?;
|
||||
|
||||
if let Some(url) = args.public_url {
|
||||
let base = config::normalize_public_url(&url);
|
||||
if let Some(base) = settings.public_url.as_deref() {
|
||||
let ttl_seconds = settings.ttl.as_secs().max(1);
|
||||
let endpoint = format!(
|
||||
"{}?ttl_seconds={ttl_seconds}",
|
||||
@@ -53,7 +52,7 @@ pub async fn issue_enroll_token(args: IssueEnrollTokenArgs) -> Result<()> {
|
||||
}
|
||||
|
||||
tracing::info!(data_dir = %settings.data_dir.display(), state_file = %settings.state_file.display(), ttl_seconds = settings.ttl.as_secs(), "issuing enroll token via offline state file fallback");
|
||||
let store = state::Store::load_or_init(&settings.state_file, args.enroll_tokens, settings.ttl)
|
||||
let store = state::Store::load_or_init(&settings.state_file, Vec::new(), settings.ttl)
|
||||
.await
|
||||
.with_context(|| {
|
||||
format!(
|
||||
|
||||
@@ -98,7 +98,7 @@ pub async fn serve(daemon: config::DaemonConfig) -> Result<()> {
|
||||
|
||||
let store = state::Store::load_or_init(
|
||||
&daemon.state_file,
|
||||
daemon.enroll_tokens.clone(),
|
||||
daemon.bootstrap_enroll_tokens.clone(),
|
||||
daemon.enroll_token_ttl,
|
||||
)
|
||||
.await
|
||||
|
||||
Reference in new issue
Block a user