removed the process_ prefix from the functions under process
Dieser Commit ist enthalten in:
Ursprung
bd3f0ad2ac
Commit
5c3183f686
2 geänderte Dateien mit 8 neuen und 13 gelöschten Zeilen
11
src/main.rs
11
src/main.rs
|
@ -13,11 +13,6 @@ pub(crate) mod utils;
|
|||
use crate::{
|
||||
consts::*,
|
||||
prelude::*,
|
||||
process::{
|
||||
process_accounts,
|
||||
process_site,
|
||||
services,
|
||||
},
|
||||
types::{
|
||||
config::{
|
||||
GeneralConfig,
|
||||
|
@ -114,7 +109,7 @@ async fn racme(flags: Arguments) {
|
|||
return;
|
||||
}
|
||||
for (name, ca) in mainconfig.ca.iter().filter(|(name, _)| used.contains(name.to_owned())) {
|
||||
process_accounts(name, ca, &mut directories, &mut accounts, &client, accountpath.clone()).await;
|
||||
process::accounts(name, ca, &mut directories, &mut accounts, &client, accountpath.clone()).await;
|
||||
}
|
||||
|
||||
|
||||
|
@ -135,7 +130,7 @@ async fn racme(flags: Arguments) {
|
|||
TokioScope::scope_and_collect(|scope| {
|
||||
for site in siteconfigs {
|
||||
if let Some(account) = accounts.get(&site.ca) {
|
||||
scope.spawn(process_site(ProcessorArgs::new(
|
||||
scope.spawn(process::site(ProcessorArgs::new(
|
||||
site,
|
||||
Arc::clone(account),
|
||||
&reload_services,
|
||||
|
@ -153,7 +148,7 @@ async fn racme(flags: Arguments) {
|
|||
.await;
|
||||
|
||||
if systemd_access {
|
||||
services(restart_services.into_inner(), reload_services.into_inner()).await;
|
||||
process::services(restart_services.into_inner(), reload_services.into_inner()).await;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -97,7 +97,7 @@ fn gen_stack(args: &ProcessorArgs, context: X509v3Context) -> Stack<X509Extensio
|
|||
stack
|
||||
}
|
||||
|
||||
pub async fn process_accounts(
|
||||
pub async fn accounts(
|
||||
name: &String,
|
||||
ca: &CA,
|
||||
directories: &mut HashMap<String, Arc<Directory>>,
|
||||
|
@ -199,7 +199,7 @@ pub async fn process_accounts(
|
|||
}
|
||||
|
||||
|
||||
pub async fn process_site(args: ProcessorArgs<'_>) {
|
||||
pub async fn site(args: ProcessorArgs<'_>) {
|
||||
let mut cert_renew = false;
|
||||
info!("Processing Site {}", args.name());
|
||||
let directory = args.certificate_dir().join(args.name().clone());
|
||||
|
@ -277,8 +277,8 @@ pub async fn process_site(args: ProcessorArgs<'_>) {
|
|||
let (_, result) = tokio::join! {
|
||||
unsafe {
|
||||
TokioScope::scope_and_collect(|scope|{
|
||||
for auth in authorizations {
|
||||
scope.spawn(process_auth(auth, args.challenge_dir(), args.dnsserver()));
|
||||
for authorization in authorizations {
|
||||
scope.spawn(auth(authorization, args.challenge_dir(), args.dnsserver()));
|
||||
}
|
||||
})
|
||||
},
|
||||
|
@ -336,7 +336,7 @@ pub async fn process_site(args: ProcessorArgs<'_>) {
|
|||
}
|
||||
}
|
||||
|
||||
pub async fn process_auth(auth: Authorization, challenge_dir: Option<PathBuf>, dnsserver: Option<Dns>) {
|
||||
pub async fn auth(auth: Authorization, challenge_dir: Option<PathBuf>, dnsserver: Option<Dns>) {
|
||||
if let Some(_dnschallenge) = auth.get_challenge("dns-01") {
|
||||
if let Some(_dnsserver) = dnsserver {
|
||||
} else {
|
||||
|
|
Laden …
Tabelle hinzufügen
In neuem Issue referenzieren