From 050fb348466cf66eaf1d83b14adfff71a9bba15b Mon Sep 17 00:00:00 2001
From: Crest <crest+ccchb@rlwinm.de>
Date: Mon, 4 Jul 2022 02:41:15 +0200
Subject: [PATCH] Deduplicate path literals

Changes #31
---
 roles/s6-rc/tasks/main.yml    | 22 +++++++++++-----------
 roles/s6-rc/templates/scan.j2 |  5 +++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/roles/s6-rc/tasks/main.yml b/roles/s6-rc/tasks/main.yml
index 3c2cf4e..6432034 100644
--- a/roles/s6-rc/tasks/main.yml
+++ b/roles/s6-rc/tasks/main.yml
@@ -11,13 +11,13 @@
     group: wheel
     mode: 0755
   with_items:
-    - /etc/s6-rc
-    - /etc/s6-rc/service
-    - /etc/s6-rc/service/enabled
+    - '{{ s6_etc_dir }}'
+    - '{{ s6_etc_dir }}/service'
+    - '{{ s6_etc_dir }}/service/enabled'
 
 - name: Define enabled services bundle
   copy:
-    dest: /etc/s6-rc/service/enabled/type
+    dest: '{{ s6_etc_dir }}/service/enabled/type'
     content: bundle
     owner: root
     group: wheel
@@ -25,7 +25,7 @@
 
 - name: Default to an empty set of enabled servics
   file:
-    path: /etc/s6-rc/service/enabled/contents
+    path: '{{ s6_etc_dir }}/service/enabled/contents'
     state: touch
     owner: root
     group: wheel
@@ -46,15 +46,15 @@
   command: >
     s6-rc-compile -v 2 .compiled.{{ s6_uuid }} service
   args:
-    creates: /etc/s6-rc/compiled
-    chdir: /etc/s6-rc
+    creates: '{{ s6_etc_dir }}/compiled'
+    chdir: '{{ s6_etc_dir }}'
 
 - name: Link to the latest service database
   command: >
     env ln -shf .compiled.{{ s6_uuid }} compiled
   args:
-    creates: /etc/s6-rc/compiled
-    chdir: /etc/s6-rc
+    creates: '{{ s6_etc_dir }}/compiled'
+    chdir: '{{ s6_etc_dir }}'
 
 - name: Make sure that tmpfs support is loaded early
   lineinfile:
@@ -72,7 +72,7 @@
 
 - name: Generate s6-svscan startup script
   template:
-    dest: /etc/s6-rc/scan
+    dest: '{{ s6_etc_dir }}/scan'
     src: scan.j2
     owner: root
     group: wheel
@@ -82,7 +82,7 @@
   lineinfile:
     path: /etc/ttys
     regexp: '^null'
-    line: 'null    "/etc/s6-rc/scan"               vt100   on secure'
+    line: 'null    "{{ s6_etc_dir }}/scan"               vt100   on secure'
   notify:
     - Reload /etc/ttys
 
diff --git a/roles/s6-rc/templates/scan.j2 b/roles/s6-rc/templates/scan.j2
index bc226d0..e324914 100644
--- a/roles/s6-rc/templates/scan.j2
+++ b/roles/s6-rc/templates/scan.j2
@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/root/bin
+scan_dir="{{ s6_scan_dir }}"
 
-install -d -o root -g wheel -m 755 /run/service
-exec s6-svscan /run/service
+install -d -o root -g wheel -m 755 -- "$scan_dir"
+exec s6-svscan "$scan_dir"