From 79bd98b67935869b48bc5869352be1d4cfdff566 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 13 Nov 2018 14:58:10 +0100
Subject: [PATCH] generic-worker on macOS: more docs, move minion config out of
 roster

---
 etc/taskcluster/macos/README.md     | 16 +++++++++++++---
 etc/taskcluster/macos/config/master |  6 ++++++
 etc/taskcluster/macos/config/roster |  6 ------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/etc/taskcluster/macos/README.md b/etc/taskcluster/macos/README.md
index 0e5b1633701..287d1010f1e 100644
--- a/etc/taskcluster/macos/README.md
+++ b/etc/taskcluster/macos/README.md
@@ -15,10 +15,20 @@ cd etc/taskcluster/macos
 ./salt-ssh '*' state.apply test=True
 ```
 
-## Servers
+## (Re)deploying a server
 
-Servers are provisioned manually from MacStadium.
-The `config/roster` file lists them by DNS name.
+* Place an order or file a ticket with MacStadium to get a new hardware or reinstall an OS.
+
+* Change the administrator password to one generated with
+  `</dev/urandom tr -d -c 'a-zA-Z' | head -c 8; echo`
+  (this short because of VNC),
+  and save it in the shared 1Password account.
+
+* Give the public IPv4 address a DNS name through Cloudflare.
+
+* Add a correponding entry in the `config/roster` file.
+
+* Log in through VNC, and run `xcode-select --install`
 
 
 ## Taskcluster secrets
diff --git a/etc/taskcluster/macos/config/master b/etc/taskcluster/macos/config/master
index 50c5179d539..ef5272e7817 100644
--- a/etc/taskcluster/macos/config/master
+++ b/etc/taskcluster/macos/config/master
@@ -5,3 +5,9 @@ file_roots:
 extension_modules: ../modules
 ext_pillar:
   - taskcluster_secrets:
+roster_defaults:
+    # https://github.com/saltstack/salt/issues/50477
+    minion_opts:
+        providers:
+            user: mac_user
+            group: mac_group
diff --git a/etc/taskcluster/macos/config/roster b/etc/taskcluster/macos/config/roster
index c1f1e5f6ee7..c65197ac82e 100644
--- a/etc/taskcluster/macos/config/roster
+++ b/etc/taskcluster/macos/config/roster
@@ -1,8 +1,2 @@
 mac1:
     host: servo-tc-mac1.servo.org
-
-    # https://github.com/saltstack/salt/issues/50477
-    minion_opts:
-        providers:
-            user: mac_user
-            group: mac_group