Add OS map for SUSE

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

tor/config.sls

@@ -1,7 +1,9 @@
 {% from "tor/map.jinja" import map with context %}
 
 include:
+  {%- if osfamily == 'Debian' %}
   - tor.repo
+  {%- endif %}
   - tor.install
 
 deploy_tor_torrc:
@@ -12,29 +14,13 @@ deploy_tor_torrc:
     - group: root
     - mode: 644
     - template: jinja
-    - defailts:
+    - defaults:
       config: {{ map.torrc }}
-    - reguire:
+    - require:
       - pkg: install_tor
     - 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
-    - defailts:
-      config: {{ map.torsocks }}
-    - reguire:
-      - pkg: install_tor
-    - watch_in:
-      - service: install_tor
-
-
 {% if salt['pillar.get']('tor:ed25519_signing_cert', False) %}
 
 deploy_tor_signing_cert:
@@ -51,7 +37,7 @@ set_owner_tor_signing_cert:
     - user: debian-tor
     - group: debian-tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
       - file: deploy_tor_signing_cert
     - watch_in:
@@ -76,7 +62,7 @@ set_owner_tor_signing_secret_key:
     - user: debian-tor
     - group: debian-tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
       - file: deploy_tor_signing_secret_key
     - watch_in:
@@ -101,7 +87,7 @@ set_owner_tor_master_id_secret_key:
     - user: debian-tor
     - group: debian-tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
       - file: deploy_tor_master_id_secret_key
     - watch_in:
@@ -127,7 +113,7 @@ set_owner_tor_master_id_public_key:
     - user: debian-tor
     - group: debian-tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
       - file: deploy_tor_master_id_public_key
     - watch_in:
@@ -145,7 +131,7 @@ deploy_tor_secret_id_key:
     - user: debian-tor
     - group: debian-tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
     - watch_in:
       - service: install_tor
@@ -161,7 +147,7 @@ deploy_tor_fingerprint:
     - user: debian-tor
     - group: debian-tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
     - watch_in:
       - service: install_tor

tor/install.sls

@@ -1,13 +1,17 @@
 {% from "tor/map.jinja" import map with context %}
 
+{%- if osfamily == 'Debian' %}
 include:
   - tor.repo
+{%- endif %}
 
 install_tor:
   pkg.installed:
     - pkgs: {{ map.pkgs }}
+    {%- if osfamily == 'Debian' %}
     - require:
       - pkgrepo: install_tor_repo
+    {%- endif %}
   service.running:
     - name: {{ map.service }}
     - restart: True

tor/osfamilymap.yaml

@@ -6,4 +6,9 @@ Debian:
   config_torsocks: '/etc/tor/torsocks.conf'
   https_support_pkg: apt-transport-https
   
-
+Suse:
+  pkgs:
+    - tor
+  service: tor
+  config_file: '/etc/tor/torrc'
+  config_torsocks: '/etc/tor/torsocks.conf'

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
+
+
+