Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-31 04:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

prep for prod infrastructure defaults

Browse Source
This commit is contained in:
Keagan McClelland
2022-01-07 16:01:54 -07:00
committed by Aiden McClelland
parent c38d6083aa
commit 3c3dab2312
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appmgr/src/context/rpc.rs
View File

@@ -145,13 +145,11 @@ impl RpcContext {
) -> Result<Self, Error> { ) -> Result<Self, Error> {
let base = RpcContextConfig::load(cfg_path).await?; let base = RpcContextConfig::load(cfg_path).await?;
tracing::info!("Loaded Config"); tracing::info!("Loaded Config");
let log_epoch = Arc::new(AtomicU64::new(rand::random()));
let tor_proxy = base.tor_socks.unwrap_or(SocketAddr::V4(SocketAddrV4::new( let tor_proxy = base.tor_socks.unwrap_or(SocketAddr::V4(SocketAddrV4::new(
Ipv4Addr::new(127, 0, 0, 1), Ipv4Addr::new(127, 0, 0, 1),
9050, 9050,
))); )));
let logger = EmbassyLogger::init( let logger = EmbassyLogger::init(
log_epoch.clone(),
base.log_server.clone(), base.log_server.clone(),
false, false,
tor_proxy.ip(), tor_proxy.ip(),

2
appmgr/src/db/model.rs
View File

@@ -50,7 +50,7 @@ impl Database {
.parse() .parse()
.unwrap(), .unwrap(),
status: ServerStatus::Running {}, status: ServerStatus::Running {},
eos_marketplace: "https://beta-registry-0-3.start9labs.com".parse().unwrap(), eos_marketplace: "https://registry.start9.com".parse().unwrap(),
package_marketplace: None, package_marketplace: None,
wifi: WifiInfo { wifi: WifiInfo {
ssids: Vec::new(), ssids: Vec::new(),

2
appmgr/src/nginx/main-ui.conf.template
View File

@@ -105,7 +105,7 @@ server {{
}} }}
location /marketplace/ {{ location /marketplace/ {{
proxy_pass https://beta-registry-0-3.start9labs.com/; # TODO proxy_pass {package_marketplace}/;
}} }}
location / {{ location / {{

9
appmgr/src/util/logger.rs
View File

@@ -1,7 +1,8 @@
use std::net::IpAddr; use std::net::{IpAddr, Ipv4Addr};
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering}; use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use lazy_static::lazy_static;
use reqwest::{Client, Proxy, Url}; use reqwest::{Client, Proxy, Url};
use serde::Serialize; use serde::Serialize;
use tracing::Subscriber; use tracing::Subscriber;
@@ -103,14 +104,14 @@ impl EmbassyLogger {
.with(ErrorLayer::default()) .with(ErrorLayer::default())
} }
pub fn no_sharing() { pub fn no_sharing() {
Self::init(None, false, IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 9050); let _ = Self::init(None, false, IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 9050);
} }
pub fn init( pub fn init(
share_dest: Option<Url>, share_dest: Option<Url>,
share_errors: bool, share_errors: bool,
tor_proxy_ip: IpAddr, tor_proxy_ip: IpAddr,
tor_proxy_port: u16, tor_proxy_port: u16,
) -> Self { ) -> Result<Self, Error> {
use tracing_subscriber::prelude::*; use tracing_subscriber::prelude::*;
let mut guard = LOGGER.lock().unwrap(); let mut guard = LOGGER.lock().unwrap();
@@ -121,7 +122,7 @@ impl EmbassyLogger {
let log_epoch = Arc::new(AtomicU64::new(rand::random())); let log_epoch = Arc::new(AtomicU64::new(rand::random()));
let sharing = Arc::new(AtomicBool::new(share_errors)); let sharing = Arc::new(AtomicBool::new(share_errors));
let share_dest = match share_dest { let share_dest = match share_dest {
None => "https://beta-registry-0-3.start9labs.com/error-logs".to_owned(), // TODO None => "http://registry.privacy34kn4ez3y3nijweec6w4g54i3g54sdv7r5mr6soma3w4begyd.onion/support/error-logs".to_owned(),
Some(a) => a.to_string(), Some(a) => a.to_string(),
}; };
let tor_proxy = Client::builder() let tor_proxy = Client::builder()