Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

use consistent config file type

Browse Source
This commit is contained in:
Aiden McClelland
2022-03-15 11:50:45 -06:00
committed by Aiden McClelland
parent 227b7a03d7
commit 20b3ab98df
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/context/rpc.rs
View File

@@ -2,12 +2,11 @@ use std::collections::{BTreeMap, VecDeque};
use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4}; use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4};
use std::ops::Deref; use std::ops::Deref;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use bollard::Docker; use bollard::Docker;
use chrono::Utc;
use color_eyre::eyre::eyre; use color_eyre::eyre::eyre;
use patch_db::json_ptr::JsonPointer; use patch_db::json_ptr::JsonPointer;
use patch_db::{DbHandle, LockType, PatchDb, Revision}; use patch_db::{DbHandle, LockType, PatchDb, Revision};
@@ -35,7 +34,7 @@ use crate::notifications::NotificationManager;
use crate::setup::password_hash; use crate::setup::password_hash;
use crate::shutdown::Shutdown; use crate::shutdown::Shutdown;
use crate::status::{MainStatus, Status}; use crate::status::{MainStatus, Status};
use crate::util::io::from_toml_async_reader; use crate::util::io::from_yaml_async_reader;
use crate::util::{AsyncFileExt, Invoke}; use crate::util::{AsyncFileExt, Invoke};
use crate::{Error, ResultExt}; use crate::{Error, ResultExt};
@@ -61,7 +60,7 @@ impl RpcContextConfig {
.await .await
.with_ctx(|_| (crate::ErrorKind::Filesystem, cfg_path.display().to_string()))? .with_ctx(|_| (crate::ErrorKind::Filesystem, cfg_path.display().to_string()))?
{ {
from_toml_async_reader(f).await from_yaml_async_reader(f).await
} else { } else {
Ok(Self::default()) Ok(Self::default())
} }

4
backend/src/context/setup.rs
View File

@@ -21,7 +21,7 @@ use crate::db::model::Database;
use crate::hostname::{derive_hostname, derive_id, get_product_key}; use crate::hostname::{derive_hostname, derive_id, get_product_key};
use crate::net::tor::os_key; use crate::net::tor::os_key;
use crate::setup::{password_hash, RecoveryStatus}; use crate::setup::{password_hash, RecoveryStatus};
use crate::util::io::from_toml_async_reader; use crate::util::io::from_yaml_async_reader;
use crate::util::AsyncFileExt; use crate::util::AsyncFileExt;
use crate::{Error, ResultExt}; use crate::{Error, ResultExt};
@@ -50,7 +50,7 @@ impl SetupContextConfig {
.await .await
.with_ctx(|_| (crate::ErrorKind::Filesystem, cfg_path.display().to_string()))? .with_ctx(|_| (crate::ErrorKind::Filesystem, cfg_path.display().to_string()))?
{ {
from_toml_async_reader(f).await from_yaml_async_reader(f).await
} else { } else {
Ok(Self::default()) Ok(Self::default())
} }