From 500cc24176d39e9d14b51399a920a7d2e22fa836 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Date: Sun, 5 Feb 2023 18:24:50 +0100
Subject: [PATCH] Move torsocks to separate state

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 tor/config.sls   | 16 ----------------
 tor/torsocks.sls | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 tor/torsocks.sls

diff --git a/tor/config.sls b/tor/config.sls
index 8795ad5..1842265 100644
--- a/tor/config.sls
+++ b/tor/config.sls
@@ -21,22 +21,6 @@ deploy_tor_torrc:
     - watch_in:
       - service: install_tor
 
-deploy_tor_torsocks:
-  file.managed:
-    - name: {{ map.config_torsocks }}
-    - source: salt://{{ slspath }}/files/ini.jinja
-    - user: root
-    - group: root
-    - mode: 644
-    - template: jinja
-    - defaults:
-      config: {{ map.torsocks }}
-    - require:
-      - pkg: install_tor
-    - watch_in:
-      - service: install_tor
-
-
 {% if salt['pillar.get']('tor:ed25519_signing_cert', False) %}
 
 deploy_tor_signing_cert:
diff --git a/tor/torsocks.sls b/tor/torsocks.sls
new file mode 100644
index 0000000..a6cdff4
--- /dev/null
+++ b/tor/torsocks.sls
@@ -0,0 +1,19 @@
+{% from "tor/map.jinja" import map with context %}
+
+deploy_tor_torsocks:
+  file.managed:
+    - name: {{ map.config_torsocks }}
+    - source: salt://{{ slspath }}/files/ini.jinja
+    - user: root
+    - group: root
+    - mode: 644
+    - template: jinja
+    - defaults:
+      config: {{ map.torsocks }}
+    - require:
+      - pkg: install_tor
+    - watch_in:
+      - service: install_tor
+
+
+