From 918e9317287c56b52981b6a3264c43d6aa6c1a81 Mon Sep 17 00:00:00 2001
From: Adrian Heine <mail@adrianheine.de>
Date: Fri, 4 Sep 2020 12:42:56 +0200
Subject: [PATCH] Put Dir and Owner in sequence

---
 src/builder.rs | 7 +++++++
 src/locator.rs | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/builder.rs b/src/builder.rs
index 325c29b..48ebca6 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -438,8 +438,10 @@ impl<D, P: AsRef<Path>> ImplementationBuilder<SystemdSocketService<D, P>> for De
   fn prerequisites(_resource: &SystemdSocketService<D, P>) -> Self::Prerequisites {}
 
   type Implementation = (
+    // First three could be parallel
     FileSymbol<PathBuf, String>,
     SystemdUserSessionSymbol<'static, String, StdCommandRunner>,
+    OwnerSymbol<StdCommandRunner, StdCommandRunner, PathBuf, String>,
     UserServiceSymbol<'static, PathBuf, String, StdCommandRunner>,
   );
   fn create(
@@ -462,6 +464,11 @@ impl<D, P: AsRef<Path>> ImplementationBuilder<SystemdSocketService<D, P>> for De
         },
       ),
       SystemdUserSessionSymbol::new(user_name.0.clone(), &StdCommandRunner),
+      OwnerSymbol::new(
+        conf_path.as_ref().parent().unwrap().to_path_buf(),
+        user_name.0.clone(),
+        StdCommandRunner,
+      ),
       UserServiceSymbol::new(
         socket_path.clone().into(),
         user_name.0.clone(),
diff --git a/src/locator.rs b/src/locator.rs
index 2eee3f4..d1f5251 100644
--- a/src/locator.rs
+++ b/src/locator.rs
@@ -371,7 +371,7 @@ impl<D: Clone + AsRef<str>, P: Policy> ResourceLocator<PhpFpmPool<D>> for Defaul
 impl<D: Clone + AsRef<str>, P, POLICY: Policy> ResourceLocator<SystemdSocketService<D, P>>
   for DefaultLocator<POLICY>
 {
-  type Prerequisites = (Dir<PathBuf>, Owner<PathBuf>);
+  type Prerequisites = Dir<PathBuf>;
   fn locate(
     resource: &SystemdSocketService<D, P>,
   ) -> (
@@ -385,9 +385,9 @@ impl<D: Clone + AsRef<str>, P, POLICY: Policy> ResourceLocator<SystemdSocketServ
       (
         PathArtifact::from(format!("/var/tmp/{}-{}.socket", user_name.0, resource.1)),
         PathArtifact::from(service_dir_path.join(format!("{}.service", resource.1))),
-        user_name.clone(),
+        user_name,
       ),
-      (Dir(service_dir_path), Owner(user_name.0, config)),
+      Dir(service_dir_path),
     )
   }
 }