diff --git a/src/builder.rs b/src/builder.rs index 5e68038..7a89085 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -2,14 +2,13 @@ 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, Resource, - ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory, + LoadedDirectory, MariaDbDatabase, MariaDbUser, NpmInstall, Owner, PhpFpmPool, PostgresqlDatabase, + 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; @@ -724,18 +723,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 5fab5e9..bdf17a7 100644 --- a/src/locator.rs +++ b/src/locator.rs @@ -5,10 +5,9 @@ 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, Resource, - ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory, + LoadedDirectory, MariaDbDatabase, MariaDbUser, NpmInstall, Owner, PhpFpmPool, PostgresqlDatabase, + Resource, ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory, SystemdSocketService, User, UserForDomain, WordpressPlugin, WordpressTranslation, - PostgresqlDatabase, }; use crate::to_artifact::ToArtifact; use std::fmt::Display;