updated tor state

states/tor/config.sls

@@ -0,0 +1,14 @@
+---
+{%- from "tor/map.jinja" import tor with context %}
+tor-config:
+  file.managed:
+    - name: /etc/tor/torrc
+    - source: salt://tor/torrc.j2
+    - user: root
+    - group: root
+    - mode: "0660"
+    - template: jinja
+    - watch_in:
+      - service: tor-service
+    - require:
+      - pkg: tor-pkg

states/tor/init.sls

@@ -1,29 +1,5 @@
 ---
-{%- from "tor/map.jinja" import tor with context %}
+include:
-tor-pkg:
+  - .install
-  pkg.latest:
+  - .config
-    - name: tor
+  - .service
-
-tor-config:
-  file.managed:
-    - name: /etc/tor/torrc
-    - source: salt://tor/torrc.j2
-    - user: root
-    - group: root
-    - mode: "0660"
-    - template: jinja
-    - watch_in:
-      - service: tor-service
-    - require:
-      - pkg: tor-pkg
-
-tor-service:
-{%- if tor.enabled %}
-  service.running:
-{%- else %}
-  service.dead:
-{%- endif %}
-    - name: tor
-    - enable: {{ tor.enabled }}
-    - require:
-      - pkg: tor-pkg

states/tor/install.sls

@@ -0,0 +1,5 @@
+---
+{%- from "tor/map.jinja" import tor with context %}
+tor-pkg:
+  pkg.installed:
+    - name: tor

states/tor/service.sls

@@ -0,0 +1,12 @@
+---
+{%- from "tor/map.jinja" import tor with context %}
+tor-service:
+{%- if tor.enabled %}
+  service.running:
+{%- else %}
+  service.dead:
+{%- endif %}
+    - name: tor
+    - enable: {{ tor.enabled }}
+    - require:
+      - pkg: tor-pkg