From ef4e72ca7d018ae59f3abe6650ce09c2aeadd677 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Mon, 12 Nov 2018 23:42:57 +0100
Subject: [PATCH] generic-worker on macOS: move generic-worker.plist template
 to a separate file

---
 .../macos/states/generic-worker.plist.jinja   | 18 +++++++++
 .../macos/states/generic-worker.sls           | 38 +++----------------
 etc/taskcluster/macos/states/top.sls          |  2 +-
 3 files changed, 25 insertions(+), 33 deletions(-)
 create mode 100644 etc/taskcluster/macos/states/generic-worker.plist.jinja

diff --git a/etc/taskcluster/macos/states/generic-worker.plist.jinja b/etc/taskcluster/macos/states/generic-worker.plist.jinja
new file mode 100644
index 000000000000..39fa43a5d87f
--- /dev/null
+++ b/etc/taskcluster/macos/states/generic-worker.plist.jinja
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>             <string>net.generic.worker</string>
+    <key>KeepAlive</key>         <true/>
+    <key>StandardOutPath</key>   <string>stdout.log</string>
+    <key>StandardErrorPath</key> <string>stderr.log</string>
+    <key>WorkingDirectory</key>  <string>{{ home }}</string>
+    <key>UserName</key>          <string>{{ user }}</string>
+    <key>ProgramArguments</key>  <array>
+        <string>{{ bin }}/generic-worker</string>
+        <string>run</string>
+        <string>--config</string>
+        <string>{{ etc }}/config.json</string>
+    </array>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/etc/taskcluster/macos/states/generic-worker.sls b/etc/taskcluster/macos/states/generic-worker.sls
index 3bacbabe2043..accc78607526 100644
--- a/etc/taskcluster/macos/states/generic-worker.sls
+++ b/etc/taskcluster/macos/states/generic-worker.sls
@@ -77,38 +77,12 @@
   file.managed:
     - mode: 644
     - template: jinja
-    - contents: >-
-        <?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-        <plist version="1.0">
-        <dict>
-          <key>Label</key>
-          <string>net.generic.worker</string>
-
-          <key>ProgramArguments</key>
-          <array>
-            <string>{{ bin }}/generic-worker</string>
-            <string>run</string>
-            <string>--config</string>
-            <string>{{ etc }}/config.json</string>
-          </array>
-
-          <key>KeepAlive</key>
-          <true/>
-
-          <key>WorkingDirectory</key>
-          <string>{{ home }}</string>
-
-          <key>UserName</key>
-          <string>{{ user }}</string>
-
-          <key>StandardOutPath</key>
-          <string>stdout.log</string>
-
-          <key>StandardErrorPath</key>
-          <string>stderr.log</string>
-        </dict>
-        </plist>
+    - source: salt://generic-worker.plist.jinja
+    - context:
+      bin: {{ bin }}
+      etc: {{ etc }}
+      home: {{ home }}
+      user: {{ user }}
 
 net.generic.worker:
   service.running:
diff --git a/etc/taskcluster/macos/states/top.sls b/etc/taskcluster/macos/states/top.sls
index 79f7a40eed3d..f72c130e4271 100644
--- a/etc/taskcluster/macos/states/top.sls
+++ b/etc/taskcluster/macos/states/top.sls
@@ -1,3 +1,3 @@
 base:
   'mac*':
-    - generic-worker
\ No newline at end of file
+    - generic-worker