diff --git a/src/builder.rs b/src/builder.rs index 7a89085..5e68038 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -2,13 +2,14 @@ use crate::command_runner::{SetuidCommandRunner, StdCommandRunner}; use crate::resources::{ AcmeAccountKey, AcmeChallengesDir, AcmeChallengesNginxSnippet, AcmeRootCert, AcmeUser, Cert, CertChain, Cron, Csr, DefaultServer, Dir, File, GitCheckout, Key, KeyAndCertBundle, - LoadedDirectory, MariaDbDatabase, MariaDbUser, NpmInstall, Owner, PhpFpmPool, PostgresqlDatabase, - Resource, ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory, + LoadedDirectory, MariaDbDatabase, MariaDbUser, NpmInstall, Owner, PhpFpmPool, Resource, + ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory, SystemdSocketService, User, UserForDomain, WordpressPlugin, WordpressTranslation, + PostgresqlDatabase, }; +use crate::storage::Storage; use crate::static_files::LETS_ENCRYPT_X3_CROSS_SIGNED; use crate::storage::SimpleStorage; -use crate::storage::Storage; use crate::symbols::acme::Cert as CertSymbol; use crate::symbols::concat::Concat as ConcatSymbol; use crate::symbols::cron::Cron as CronSymbol; @@ -723,18 +724,18 @@ impl ImplementationBuilder> for DefaultBuilder { () } - type Implementation = (PostgreSQLDatabaseSymbol<'static, String, String, StdCommandRunner>,); + type Implementation = ( + PostgreSQLDatabaseSymbol<'static, String, String, StdCommandRunner>, + ); fn create( _resource: &PostgresqlDatabase, (db_name, data_path): & as Resource>::Artifact, _: ::Artifact, ) -> Self::Implementation { let db_dump = SimpleStorage::new(data_path.clone().into()); - (PostgreSQLDatabaseSymbol::new( - db_name.0.clone(), - db_dump.read_filename().unwrap().to_str().unwrap().into(), - &StdCommandRunner, - ),) + ( + PostgreSQLDatabaseSymbol::new(db_name.0.clone(), db_dump.read_filename().unwrap().to_str().unwrap().into(), &StdCommandRunner), + ) } } diff --git a/src/locator.rs b/src/locator.rs index bdf17a7..5fab5e9 100644 --- a/src/locator.rs +++ b/src/locator.rs @@ -5,9 +5,10 @@ use crate::artifacts::{ use crate::resources::{ AcmeAccountKey, AcmeChallengesDir, AcmeChallengesNginxSnippet, AcmeRootCert, AcmeUser, Cert, CertChain, Cron, Csr, DefaultServer, Dir, File, GitCheckout, Key, KeyAndCertBundle, - LoadedDirectory, MariaDbDatabase, MariaDbUser, NpmInstall, Owner, PhpFpmPool, PostgresqlDatabase, - Resource, ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory, + LoadedDirectory, MariaDbDatabase, MariaDbUser, NpmInstall, Owner, PhpFpmPool, Resource, + ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory, SystemdSocketService, User, UserForDomain, WordpressPlugin, WordpressTranslation, + PostgresqlDatabase, }; use crate::to_artifact::ToArtifact; use std::fmt::Display;