fix dependencies

2 files changed, 6 insertions, 10 deletions

diff --git a/modules/base/manifests/user.pp b/modules/base/manifests/user.pp
index 69b6740..454c2a7 100644
--- a/modules/base/manifests/user.pp
+++ b/modules/base/manifests/user.pp
@@ -96,6 +96,11 @@ define base::user(
             File["${_home}"],
           ];
       }
+
+      File["${_home}/.cargo"] -> Rust::User[$user]
+      File["${_home}/.rustup"] -> Rust::User[$user]
+      File["$persistent_data/rustup/${user}"] -> Rust::User[$user]
+      File["$persistent_data/cargo/${user}"] -> Rust::User[$user]
     }
 
     rust::user { $user:
diff --git a/modules/rust/manifests/user.pp b/modules/rust/manifests/user.pp
index 1b16eeb..e94a5fd 100644
--- a/modules/rust/manifests/user.pp
+++ b/modules/rust/manifests/user.pp
@@ -1,12 +1,4 @@
-define rust::user($user=$name, $home=undef) {
-  $_home = $home ? {
-    undef => $user ? {
-      'root' => '/root',
-      default => "/home/$user",
-    },
-    default => $home,
-  }
-
+define rust::user($user=$name) {
   include rust
 
   exec { "install and configure stable toolchain for $user":
@@ -17,7 +9,6 @@ define rust::user($user=$name, $home=undef) {
     require => [
       Package["rustup"],
       User[$user],
-      File["${_home}/.rustup"],
     ],
   }
 }