From 3ccfc9e327263111ec2f2d1152c9b212921a3d1a Mon Sep 17 00:00:00 2001 From: Rodolphe Breard Date: Sat, 29 Jun 2019 13:48:54 +0200 Subject: [PATCH] Use the HookType enum from the hook module --- acmed/src/certificate.rs | 4 ++-- acmed/src/hooks.rs | 2 +- acmed/src/storage.rs | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/acmed/src/certificate.rs b/acmed/src/certificate.rs index 1e86921..6a67b13 100644 --- a/acmed/src/certificate.rs +++ b/acmed/src/certificate.rs @@ -1,6 +1,6 @@ use crate::acme_proto::Challenge; -use crate::config::{Account, Domain, HookType}; -use crate::hooks::{self, ChallengeHookData, Hook, HookEnvData, PostOperationHookData}; +use crate::config::{Account, Domain}; +use crate::hooks::{self, ChallengeHookData, Hook, HookEnvData, HookType, PostOperationHookData}; use crate::storage::{certificate_files_exists, get_certificate}; use acme_common::crypto::X509Certificate; use acme_common::error::Error; diff --git a/acmed/src/hooks.rs b/acmed/src/hooks.rs index e5ca0aa..ad7e5c3 100644 --- a/acmed/src/hooks.rs +++ b/acmed/src/hooks.rs @@ -1,5 +1,5 @@ use crate::certificate::Certificate; -use crate::config::HookType; +pub use crate::config::HookType; use acme_common::error::Error; use handlebars::Handlebars; use serde::Serialize; diff --git a/acmed/src/storage.rs b/acmed/src/storage.rs index 2f17de8..6acad59 100644 --- a/acmed/src/storage.rs +++ b/acmed/src/storage.rs @@ -1,6 +1,5 @@ use crate::certificate::Certificate; -use crate::config::HookType; -use crate::hooks::{self, FileStorageHookData, HookEnvData}; +use crate::hooks::{self, FileStorageHookData, HookEnvData, HookType}; use acme_common::b64_encode; use acme_common::crypto::{KeyPair, X509Certificate}; use acme_common::error::Error;