Manage hidden services

Add support for managing hidden services using pillar data.

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

README.rst

@@ -1,8 +1,9 @@
 ================
-salt-tor-formula
+tor-formula
 ================
 
-Simple Salt formula to install tor relay on debian.
+Simple Salt formula to install and configure Tor on SUSE based distributions.
+Forked from https://github.com/upya4ko/salt-tor-formula - thank you.
 
 .. note::
 
@@ -18,10 +19,15 @@ Available states
 ``tor``
 -----------------------
 
-Install packets and setup config files.
+Install and configure Tor.
 
 ``tor.install``
 -------------------------------
 
-Only install packets.
+Only install Tor packages.
+
+``tor.torsocks``
+-------------------------------
+
+Install and configure torsocks.
 

pillar-example.sls

@@ -42,4 +42,14 @@ tor:
     szdklfjskldjfl;kasjdfl;jasdl;fajdfkjdkfjsdkjfkjdfadfjsdkfjlakdjf
     -----END RSA PRIVATE KEY-----
 
-  
+  hidden_services:
+    mywebsite:
+      virtport: 80
+      target: '[::1]:8080'
+      # this cannot "create" a new service - it is intended to install a service with an existing hostname and keypair
+      hostname: baz.onion
+      hs_ed25519_public_key: |
+        Zm9vCg==
+      hs_ed25519_secret_key: |
+        YmFyCg==
+

tor/config.sls

@@ -1,7 +1,6 @@
-{% from "tor/map.jinja" import map with context %}
+{%- from "tor/map.jinja" import map with context -%}
 
 include:
-  - tor.repo
   - tor.install
 
 deploy_tor_torrc:
@@ -12,31 +11,17 @@ deploy_tor_torrc:
     - group: root
     - mode: 644
     - template: jinja
-    - defailts:
+    - defaults:
       config: {{ map.torrc }}
-    - reguire:
+    - context:
+      hsmap: {{ map.hidden_services }}
+      hsdir: {{ map.hs_directory }}
+    - require:
       - pkg: install_tor
     - watch_in:
       - service: install_tor
 
-deploy_tor_torsocks:
+{%- if salt['pillar.get']('tor:ed25519_signing_cert', False) %}
-  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:
   file.decode:
     - name: {{ map.torrc.DataDirectory }}/keys/ed25519_signing_cert
@@ -48,20 +33,17 @@ deploy_tor_signing_cert:
 set_owner_tor_signing_cert:
   file.managed:
     - name: {{ map.torrc.DataDirectory }}/keys/ed25519_signing_cert
-    - user: debian-tor
+    - user: tor
-    - group: debian-tor
+    - group: tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
       - file: deploy_tor_signing_cert
     - watch_in:
       - service: install_tor
+{%- endif %}
 
-{% endif %}
+{%- if salt['pillar.get']('tor:ed25519_signing_secret_key', False) %}
-
-
-{% if salt['pillar.get']('tor:ed25519_signing_secret_key', False) %}
-
 deploy_tor_signing_secret_key:
   file.decode:
     - name: {{ map.torrc.DataDirectory }}/keys/ed25519_signing_secret_key
@@ -73,20 +55,17 @@ deploy_tor_signing_secret_key:
 set_owner_tor_signing_secret_key:
   file.managed:
     - name: {{ map.torrc.DataDirectory }}/keys/ed25519_signing_secret_key
-    - user: debian-tor
+    - user: tor
-    - group: debian-tor
+    - group: tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
       - file: deploy_tor_signing_secret_key
     - watch_in:
       - service: install_tor
+{%- endif %}
 
-{% endif %}
+{%- if salt['pillar.get']('tor:ed25519_master_id_secret_key', False) %}
-
-
-{% if salt['pillar.get']('tor:ed25519_master_id_secret_key', False) %}
-
 deploy_tor_master_id_secret_key:
   file.decode:
     - name: {{ map.torrc.DataDirectory }}/keys/ed25519_master_id_secret_key
@@ -98,21 +77,17 @@ deploy_tor_master_id_secret_key:
 set_owner_tor_master_id_secret_key:
   file.managed:
     - name: {{ map.torrc.DataDirectory }}/keys/ed25519_master_id_secret_key
-    - user: debian-tor
+    - user: tor
-    - group: debian-tor
+    - group: tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
       - file: deploy_tor_master_id_secret_key
     - watch_in:
       - service: install_tor
+{%- endif %}
 
-{% endif %}
+{%- if salt['pillar.get']('tor:ed25519_master_id_public_key', False) %}
-
-
-
-{% if salt['pillar.get']('tor:ed25519_master_id_public_key', False) %}
-
 deploy_tor_master_id_public_key:
   file.decode:
     - name: {{ map.torrc.DataDirectory }}/keys/ed25519_master_id_public_key
@@ -124,47 +99,40 @@ deploy_tor_master_id_public_key:
 set_owner_tor_master_id_public_key:
   file.managed:
     - name: {{ map.torrc.DataDirectory }}/keys/ed25519_master_id_public_key
-    - user: debian-tor
+    - user: tor
-    - group: debian-tor
+    - group: tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
       - file: deploy_tor_master_id_public_key
     - watch_in:
       - service: install_tor
+{%- endif %}
 
-{% endif %}
+{%- if salt['pillar.get']('tor:secret_id_key', False) %}
-
-
-
-{% if salt['pillar.get']('tor:secret_id_key', False) %}
 deploy_tor_secret_id_key:
   file.managed:
     - name: {{ map.torrc.DataDirectory }}/keys/secret_id_key
     - contents_pillar: tor:secret_id_key
-    - user: debian-tor
+    - user: tor
-    - group: debian-tor
+    - group: tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
     - watch_in:
       - service: install_tor
-{% endif %}
+{%- endif %}
 
-
+{%- if salt['pillar.get']('tor:fingerprint', False) %}
-
-{% if salt['pillar.get']('tor:fingerprint', False) %}
 deploy_tor_fingerprint:
   file.managed:
     - name: {{ map.torrc.DataDirectory }}/fingerprint
     - contents_pillar: tor:fingerprint
-    - user: debian-tor
+    - user: tor
-    - group: debian-tor
+    - group: tor
     - mode: 600
-    - reguire:
+    - require:
       - file: deploy_tor_torrc
     - watch_in:
       - service: install_tor
-{% endif %}
+{%- endif %}
-
-

tor/defaults.yaml

@@ -2,245 +2,11 @@ tor:
   pkgs:
     - tor
   service: tor
-  https_support_pkg: apt-transport-https
   config_torrc: '/etc/tor/torrc'
   config_torsocks: '/etc/tor/torsocks.conf'
-  repo_url: 'https://deb.torproject.org/torproject.org'
+  hs_directory: '/var/lib/tor/services'
-  repo_key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
-  fingerprint: False  
 
   torrc:
-    ## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't
-    ## configure one below. Set "SOCKSPort 0" if you plan to run Tor only
-    ## as a relay, and not make any local application connections yourself.
-    #SOCKSPort: '9050' # Default: Bind to localhost:9050 for local connections.
-    #SOCKSPort: '192.168.0.1:9100' # Bind to this address:port too.
-    SOCKSPort: '9050' # Default: Bind to localhost:9050 for local connections.
-    
-    ## Entry policies to allow/deny SOCKS requests based on IP address.
-    ## First entry that matches wins. If no SOCKSPolicy is set, we accept
-    ## all (and only) requests that reach a SOCKSPort. Untrusted users who
-    ## can access your SOCKSPort may be able to learn about the connections
-    ## you make.
-    #SOCKSPolicy: 'accept 192.168.0.0/16'
-    #SOCKSPolicy: 'accept6 FC00::/7'
-    #SOCKSPolicy: 'reject *'
-    SOCKSPolicy: 'accept *'
-  
-    ## Logs go to stdout at level "notice" unless redirected by something
-    ## else, like one of the below lines. You can have as many Log lines as
-    ## you want.
-    ##
-    ## We advise using "notice" in most cases, since anything more verbose
-    ## may provide sensitive information to an attacker who obtains the logs.
-    ##
-    ## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
-    #'Log notice file': '/var/log/tor/notices.log'
-    ## Send every possible message to /var/log/tor/debug.log
-    #'Log debug file': '/var/log/tor/debug.log'
-    ## Use the system log instead of Tor's logfiles
-    #'Log notice': 'syslog'
-    ## To send all messages to stderr:
-    #'Log debug': 'stderr'
-
-    ## Uncomment this to start the process in the background... or use
-    ## --runasdaemon 1 on the command line. This is ignored on Windows;
-    ## see the FAQ entry if you want Tor to run as an NT service.
-    RunAsDaemon: '1'
-    
-    ## The directory for keeping all the keys/etc. By default, we store
-    ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
     DataDirectory: '/var/lib/tor'
 
-    ## The port on which Tor will listen for local connections from Tor
+  hidden_services: {}
-    ## controller applications, as documented in control-spec.txt.
-    #ControlPort: '9051'
-    ## If you enable the controlport, be sure to enable one of these
-    ## authentication methods, to prevent attackers from accessing it.
-    #HashedControlPassword: '16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C'
-    #CookieAuthentication: '1'
-
-    ############### This section is just for location-hidden services ###
-
-    ## Once you have configured a hidden service, you can look at the
-    ## contents of the file ".../hidden_service/hostname" for the address
-    ## to tell people.
-    ##
-    ## HiddenServicePort x y:z says to redirect requests on port x to the
-    ## address y:z.
-    
-    #HiddenServiceDir: '/var/lib/tor/hidden_service/'
-    #HiddenServicePort: '80 127.0.0.1:80'
-    
-    #HiddenServiceDir: '/var/lib/tor/other_hidden_service/'
-    #HiddenServicePort: '80 127.0.0.1:80'
-    #HiddenServicePort: '22 127.0.0.1:22'
-    
-    ################ This section is just for relays #####################
-    #
-    ## See https://www.torproject.org/docs/tor-doc-relay for details.
-    
-    ## Required: what port to advertise for incoming Tor connections.
-    ## If you want to listen on a port other than the one advertised in
-    ## ORPort (e.g. to advertise 443 but bind to 9090), you can do it as
-    ## follows.  You'll need to do ipchains or other port forwarding
-    ## yourself to make this work.
-    #ORPort 443 NoListen
-    #ORPort 127.0.0.1:9090 NoAdvertise
-    ORPort: '9001'
-
-    
-    ## The IP address or full DNS name for incoming connections to your
-    ## relay. Leave commented out and Tor will guess.
-    #Address: 'noname.example.com'
-    
-    ## If you have multiple network interfaces, you can specify one for
-    ## outgoing traffic to use.
-    #OutboundBindAddress: '10.0.0.5'
-    
-    ## A handle for your relay, so people don't have to refer to it by key.
-    ## Nicknames must be between 1 and 19 characters inclusive, and must
-    ## contain only the characters [a-zA-Z0-9].
-    #Nickname: 'ididnteditheconfig'
-    
-    ## Define these to limit how much relayed traffic you will allow. Your
-    ## own traffic is still unthrottled. Note that RelayBandwidthRate must
-    ## be at least 75 kilobytes per second.
-    ## Note that units for these config options are bytes (per second), not
-    ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10,
-    ## 2^20, etc.
-    #RelayBandwidthRate: '100 KBytes'  # Throttle traffic to 100KB/s (800Kbps)
-    #RelayBandwidthBurst: '200 KBytes' # But allow bursts up to 200KB (1600Kb)
-    
-    ## Use these to restrict the maximum traffic per day, week, or month.
-    ## Note that this threshold applies separately to sent and received bytes,
-    ## not to their sum: setting "40 GB" may allow up to 80 GB total before
-    ## hibernating.
-    ##
-    ## Set a maximum of 40 gigabytes each way per period.
-    #AccountingMax: '40 GBytes'
-    ## Each period starts daily at midnight (AccountingMax is per day)
-    #AccountingStart: 'day 00:00'
-    ## Each period starts on the 3rd of the month at 15:00 (AccountingMax
-    ## is per month)
-    #AccountingStart: 'month 3 15:00'
-    
-    ## Administrative contact information for this relay or bridge. This line
-    ## can be used to contact you if your relay or bridge is misconfigured or
-    ## something else goes wrong. Note that we archive and publish all
-    ## descriptors containing these lines and that Google indexes them, so
-    ## spammers might also collect them. You may want to obscure the fact that
-    ## it's an email address and/or generate a new address for this purpose.
-    #ContactInfo: 'Random Person <nobody AT example dot com>'
-    ## You might also include your PGP or GPG fingerprint if you have one:
-    #ContactInfo: '0xFFFFFFFF Random Person <nobody AT example dot com>'
-    
-    ## Uncomment this to mirror directory information for others. Please do
-    ## if you have enough bandwidth.
-    #DirPort: '9030' # what port to advertise for directory connections
-    ## If you want to listen on a port other than the one advertised in
-    ## DirPort (e.g. to advertise 80 but bind to 9091), you can do it as
-    ## follows.  below too. You'll need to do ipchains or other port
-    ## forwarding yourself to make this work.
-    #DirPort: '80 NoListen'
-    #DirPort: '127.0.0.1:9091 NoAdvertise'
-    ## Uncomment to return an arbitrary blob of html on your DirPort. Now you
-    ## can explain what Tor is if anybody wonders why your IP address is
-    ## contacting them. See contrib/tor-exit-notice.html in Tor's source
-    ## distribution for a sample.
-    #DirPortFrontPage: '/etc/tor/tor-exit-notice.html'
-    
-    ## Uncomment this if you run more than one Tor relay, and add the identity
-    ## key fingerprint of each Tor relay you control, even if they're on
-    ## different networks. You declare it here so Tor clients can avoid
-    ## using more than one of your relays in a single circuit. See
-    ## https://www.torproject.org/docs/faq#MultipleRelays
-    ## However, you should never include a bridge's fingerprint here, as it would
-    ## break its concealability and potentially reveal its IP/TCP address.
-    #MyFamily: '$keyid,$keyid,...'
-    
-    ## A comma-separated list of exit policies. They're considered first
-    ## to last, and the first match wins.
-    ##
-    ## If you want to allow the same ports on IPv4 and IPv6, write your rules
-    ## using accept/reject *. If you want to allow different ports on IPv4 and
-    ## IPv6, write your IPv6 rules using accept6/reject6 *6, and your IPv4 rules
-    ## using accept/reject *4.
-    ##
-    ## If you want to _replace_ the default exit policy, end this with either a
-    ## reject *:* or an accept *:*. Otherwise, you're _augmenting_ (prepending to)
-    ## the default exit policy. Leave commented to just use the default, which is
-    ## described in the man page or at
-    ## https://www.torproject.org/documentation.html
-    ##
-    ## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
-    ## for issues you might encounter if you use the default exit policy.
-    ##
-    ## If certain IPs and ports are blocked externally, e.g. by your firewall,
-    ## you should update your exit policy to reflect this -- otherwise Tor
-    ## users will be told that those destinations are down.
-    ##
-    ## For security, by default Tor rejects connections to private (local)
-    ## networks, including to the configured primary public IPv4 and IPv6 addresses,
-    ## and any public IPv4 and IPv6 addresses on any interface on the relay.
-    ## See the man page entry for ExitPolicyRejectPrivate if you want to allow
-    ## "exit enclaving".
-    ##
-    #ExitPolicy: 'accept *:6660-6667,reject *:*' # allow irc ports on IPv4 and IPv6 but no more
-    #ExitPolicy: 'accept *:119' # accept nntp ports on IPv4 and IPv6 as well as default exit policy
-    #ExitPolicy: 'accept *4:119' # accept nntp ports on IPv4 only as well as default exit policy
-    #ExitPolicy: 'accept6 *6:119' # accept nntp ports on IPv6 only as well as default exit policy
-    #ExitPolicy: 'reject *:*' # no exits allowed
-    
-    ## Bridge relays (or "bridges") are Tor relays that aren't listed in the
-    ## main directory. Since there is no complete public list of them, even an
-    ## ISP that filters connections to all the known Tor relays probably
-    ## won't be able to block all the bridges. Also, websites won't treat you
-    ## differently because they won't know you're running Tor. If you can
-    ## be a real relay, please do; but if not, be a bridge!
-    #BridgeRelay: '1'
-    ## By default, Tor will advertise your bridge to users through various
-    ## mechanisms like https://bridges.torproject.org/. If you want to run
-    ## a private bridge, for example because you'll give out your bridge
-    ## address manually to your friends, uncomment this line:
-    #PublishServerDescriptor: '0'
-
-  torsocks:
-    # Default Tor address and port. By default, Tor will listen on localhost for
-    # any SOCKS connection and relay the traffic on the Tor network.
-    TorAddress: '127.0.0.1'
-    TorPort: '9050'
-    
-    # Tor hidden sites do not have real IP addresses. This specifies what range of
-    # IP addresses will be handed to the application as "cookies" for .onion names.
-    # Of course, you should pick a block of addresses which you aren't going to
-    # ever need to actually connect to. This is similar to the MapAddress feature
-    # of the main tor daemon.
-    OnionAddrRange: '127.42.42.0/24'
-    
-    # SOCKS5 Username and Password. This is used to isolate the torsocks connection
-    # circuit from other streams in Tor. Use with option IsolateSOCKSAuth (on by
-    # default) in tor(1). TORSOCKS_USERNAME and TORSOCKS_PASSWORD environment
-    # variable overrides these options.
-    #SOCKS5Username: <username>
-    #SOCKS5Password: <password>
-    
-    # Set Torsocks to accept inbound connections. If set to 1, listen() and
-    # accept() will be allowed to be used with non localhost address. (Default: 0)
-    #AllowInbound: '1'
-    
-    # Set Torsocks to allow outbound connections to the loopback interface.
-    # If set to 1, connect() will be allowed to be used to the loopback interface
-    # bypassing Tor. If set to 2, in addition to TCP connect(), UDP operations to
-    # the loopback interface will also be allowed, bypassing Tor. This option
-    # should not be used by most users. (Default: 0)
-    #AllowOutboundLocalhost: '1'
-    
-    # Set Torsocks to use an automatically generated SOCKS5 username/password based
-    # on the process ID and current time, that makes the connections to Tor use a
-    # different circuit from other existing streams in Tor on a per-process basis.
-    # If set, the SOCKS5Username and SOCKS5Password options must not be set.
-    # (Default: 0)
-    #IsolatePID: '1'
-   
-

tor/files/ini.jinja

@@ -27,3 +27,9 @@
 {{ set_config(config) }}
 {% endif -%}
 
+{%- if hsmap | length %}
+{%- for hs, config in hsmap.items() %}
+HiddenServiceDir {{ hsdir }}/{{ hs }}
+HiddenServicePort {{ config['virtport'] }} {{ config['target'] }}
+{%- endfor %}
+{%- endif %}

tor/init.sls

@@ -1,5 +1,4 @@
-
 include:
-  - tor.repo
   - tor.install
   - tor.config
+  - tor.services

tor/install.sls

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

tor/map.jinja

@@ -1,10 +1,8 @@
-{% import_yaml "tor/defaults.yaml" as defaults %}
+{%- import_yaml "tor/defaults.yaml" as defaults -%}
-{% import_yaml "tor/osfamilymap.yaml" as osfamilymap %}
+{%- import_yaml "tor/osfamilymap.yaml" as osfamilymap -%}
 
-{% set map = salt['grains.filter_by'](defaults,
+{%- set map = salt['grains.filter_by'](defaults,
 
   merge=salt['grains.filter_by']( osfamilymap, grain='os_family',
     merge=salt['pillar.get']('tor', {}), ),
-base='tor') %}
+base='tor') -%}
-
-

tor/osfamilymap.yaml

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

tor/repo.sls

@@ -1,22 +0,0 @@
-{% from "tor/map.jinja" import map with context %}
-{% set osfamily = salt['grains.get']('os_family', False) %}
-
-{% if osfamily == 'Debian' %}
-{% set codename = salt['grains.get']('lsb_distrib_codename') %}
-
-add_apt_https_support_for_tor:
-  pkg.installed:
-    - name: {{ map.https_support_pkg }}
-    - require_in:
-      - pkgrepo: install_tor_repo
-
-install_tor_repo:
-  pkgrepo.managed:
-    - name: deb {{ map.repo_url }} {{ codename }} main
-    - file: /etc/apt/sources.list.d/tor.list
-    - key_url: {{ map.repo_key_url }}
-    - require:
-      - pkg: add_apt_https_support_for_tor
-
-
-{% endif %}

tor/services.sls

@@ -0,0 +1,62 @@
+{%- from "tor/map.jinja" import map with context -%}
+{%- set services = map.hidden_services -%}
+{%- set servicedir = map.hs_directory ~ '/' -%}
+
+{%- macro permissions(type='f') -%}
+    - user: tor
+    - group: tor
+    {%- if type == 'f' %}
+    - mode: 600
+    {%- elif type == 'd' %}
+    - mode: 700
+    {%- endif %}
+{%- endmacro -%}
+
+tor_hs_directory:
+  file.directory:
+    - name: {{ servicedir }}
+    {{ permissions('d') }}
+    - require:
+      - pkg: install_tor
+
+{%- for service, config in services.items() %}
+{%- set myservicedir = servicedir ~ service ~ '/' %}
+
+tor_hs_{{ service }}_directory:
+  file.directory:
+    - name: {{ myservicedir }}
+    {{ permissions('d') }}
+    - require:
+      - file: tor_hs_directory
+
+{%- for binfile in ['hs_ed25519_public_key', 'hs_ed25519_secret_key'] %}
+tor_hs_{{ service }}_{{ binfile }}:
+  file.decode:
+    - name: {{ myservicedir }}{{ binfile }}
+    - contents_pillar: tor:hidden_services:{{ service }}:{{ binfile }}
+    - encoding_type: base64
+    - require:
+      - file: tor_hs_{{ service }}_directory
+    - watch_in:
+      - service: install_tor
+
+tor_hs_{{ service }}_{{ binfile }}_permissions:
+  file.managed:
+    - name: {{ myservicedir }}{{ binfile }}
+    {{ permissions() }}
+    - require:
+      - file: tor_hs_{{ service }}_{{ binfile }}
+    - watch_in:
+      - service: install_tor
+{%- endfor %}
+
+tor_hs_{{ service }}_hostname:
+  file.managed:
+    - name: {{ myservicedir }}hostname
+    {{ permissions() }}
+    - contents: {{ config['hostname'] }}
+    - require:
+      - file: tor_hs_{{ service }}_directory
+    - watch_in:
+      - service: install_tor
+{%- endfor %}

tor/torsocks.sls

@@ -0,0 +1,26 @@
+{%- from "tor/map.jinja" import map with context -%}
+
+install_torsocks:
+  pkg.installed:
+    - name: torsocks
+  service.running:
+    - name: {{ map.service_torsocks }}
+    - restart: True
+    - enable: True
+    - require:
+      - pkg: install_torsocks
+
+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_torsocks
+    - watch_in:
+      - service: install_torsocks