|
@ -8,7 +8,7 @@ use symbols::list::List; |
|
|
use symbols::owner::Owner;
|
|
|
use symbols::owner::Owner;
|
|
|
use symbols::Symbol;
|
|
|
use symbols::Symbol;
|
|
|
|
|
|
|
|
|
pub fn new<'a, R: CommandRunner, C: 'a + AsRef<str>, U: 'a + AsRef<str>, H: AsRef<Path>>(
|
|
|
|
|
|
|
|
|
pub fn new<'a, R: CommandRunner, C: 'a + AsRef<str>, U: 'a + AsRef<str> + Clone, H: AsRef<Path>>(
|
|
|
command_runner: &'a R,
|
|
|
command_runner: &'a R,
|
|
|
cert: C,
|
|
|
cert: C,
|
|
|
user_name: U,
|
|
|
user_name: U,
|
|
@ -18,16 +18,15 @@ pub fn new<'a, R: CommandRunner, C: 'a + AsRef<str>, U: 'a + AsRef<str>, H: AsRe |
|
|
let account_key_file = path("account.key");
|
|
|
let account_key_file = path("account.key");
|
|
|
List::from((
|
|
|
List::from((
|
|
|
AcmeAccountKey::new(account_key_file.clone(), command_runner),
|
|
|
AcmeAccountKey::new(account_key_file.clone(), command_runner),
|
|
|
// FIXME into or cow or clone
|
|
|
|
|
|
Owner::new(
|
|
|
Owner::new(
|
|
|
account_key_file,
|
|
|
account_key_file,
|
|
|
user_name.as_ref().to_owned(),
|
|
|
|
|
|
|
|
|
user_name.clone(),
|
|
|
command_runner,
|
|
|
command_runner,
|
|
|
),
|
|
|
),
|
|
|
Dir::new(path("challenges")),
|
|
|
Dir::new(path("challenges")),
|
|
|
Owner::new(
|
|
|
Owner::new(
|
|
|
path("challenges"),
|
|
|
path("challenges"),
|
|
|
user_name.as_ref().to_owned(),
|
|
|
|
|
|
|
|
|
user_name.clone(),
|
|
|
command_runner,
|
|
|
command_runner,
|
|
|
),
|
|
|
),
|
|
|
Dir::new("/etc/ssl/local_certs"),
|
|
|
Dir::new("/etc/ssl/local_certs"),
|
|
|