Revert "Initial generic-worker config file"

This reverts commit c28fa07a98.

etc/taskcluster/macos/README.md

@@ -14,7 +14,3 @@ cd etc/taskcluster/macos
 ./salt-ssh '*' test.ping
 ./salt-ssh '*' state.apply test=True
 ```
-
-## Worker’s client ID
-
-`project/servo/worker/macos/1`

etc/taskcluster/macos/Saltfile

@@ -1,3 +1,2 @@
 salt-ssh:
   config_dir: ./config
-  state_verbose: False

etc/taskcluster/macos/states/generic-worker.sls

@@ -1,7 +1,4 @@
-{% set bin = "/usr/local/bin" %}
+/usr/local/bin/generic-worker:
-{% set keyfile = "/etc/generic-worker/key" %}
-
-{{ bin }}/generic-worker:
   file.managed:
     - name:
     - source: https://github.com/taskcluster/generic-worker/releases/download/v11.0.1/generic-worker-darwin-amd64
@@ -9,28 +6,18 @@
     - mode: 755
     - makedirs: True
 
-{{ bin }}/livelog:
+/usr/local/bin/livelog:
   file.managed:
     - source: https://github.com/taskcluster/livelog/releases/download/v1.1.0/livelog-darwin-amd64
     - source_hash: sha256=be5d4b998b208afd802ac6ce6c4d4bbf0fb3816bb039a300626abbc999dfe163
     - mode: 755
     - makedirs: True
 
-/etc/generic-worker/config.json:
+/etc/generic-worker:
-  file.serialize:
+  file.directory:
-    - makedirs: True
+    - dir_mode: 700
-    - mode: 600
-    - show_changes: False
-    - formatter: json
-    - dataset:
-        provisionerId: proj-servo
-        workerType: macos
-        workerId: servo-macos-1
-        clientId: project/servo/worker/macos/1
-        publicIP: {{ salt.network.ip_addrs()[0] }}
-        signingKeyLocation: {{ keyfile }}
 
-generic-worker new-openpgp-keypair --file {{ keyfile }}:
+generic-worker new-openpgp-keypair --file /etc/generic-worker/key:
   cmd.run:
-    - creates: {{ keyfile }}
+    - creates: /etc/generic-worker/key
-    - prepend_path: {{ bin }}
+    - prepend_path: /usr/local/bin