Clean-up of x2042blah & add 'builder' account

diff --git a/test-vagrant-salt/salt/testvm/users.sls b/test-vagrant-salt/salt/testvm/users.sls
index ee9e237..84f8cf5 100644 (file)
--- a/test-vagrant-salt/salt/testvm/users.sls
+++ b/test-vagrant-salt/salt/testvm/users.sls
@@ -5,21 +5,23 @@ x2042blah:
     - gid: 100
     - shell: /bin/sh
     - createhome: true
+    - home: /home/x2042blah
     - groups:
       - adm
 
-/home/x2042blah/:
-  file.directory:
-    - user: x2042blah
-    - group: users
-    - makedirs: True
-    - requires:
-      - user: x2042blah
-
 /home/x2042blah/.forward:
   file.managed:
     - user: x2042blah
     - group: users
     - contents: x2042blah-forwarded@hruid.polytechnique.org
-    - requires:
+    - require:
       - user: x2042blah
+
+# Builder account for salt
+builder:
+  user.present:
+    - fullname: Builder
+    - gid: 100
+    - shell: /usr/sbin/nologin
+    - createhome: true
+    - home: /usr/src/builder