From 1b704043f7b7f1d26c8d2b6cab44c5703d0c09bc Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 17 Sep 2017 13:53:38 +0200
Subject: [PATCH] net/tor: whitespace sweep

---
 .../src/opnsense/mvc/app/views/OPNsense/Tor/general.volt  | 4 ++--
 .../src/opnsense/service/conf/actions.d/actions_tor.conf  | 1 -
 net/tor/src/opnsense/service/scripts/tor/setup.sh         | 2 --
 net/tor/src/opnsense/service/scripts/tor/tor_helper.php   | 1 -
 net/tor/src/opnsense/service/templates/OPNsense/Tor/torrc | 8 ++++----
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/net/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt b/net/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt
index 35d5d9d38..ab1db2e0a 100644
--- a/net/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt
+++ b/net/tor/src/opnsense/mvc/app/views/OPNsense/Tor/general.volt
@@ -32,7 +32,7 @@
 
 $( document ).ready(function() {
     var data_get_map = {
-        'general': '/api/tor/general/get', 
+        'general': '/api/tor/general/get',
         'relay': '/api/tor/relay/get'
     };
     mapDataToFormUI(data_get_map).done(function(data){
@@ -201,7 +201,7 @@ $( document ).ready(function() {
             <button class="btn btn-primary" id="relaysaveAct" type="button"><b>{{ lang._('Save') }}</b> <i class="saveAct_progress"></i></button>
         </div>
     </div>
-    
+
     <div id="exitnodeacl" class="tab-pane fade in">
         <div class="alert alert-danger" role="alert">
             {{ lang._('Running an exit node may be lead to legal issues and seized hardware. Be careful with your settings here.') }}
diff --git a/net/tor/src/opnsense/service/conf/actions.d/actions_tor.conf b/net/tor/src/opnsense/service/conf/actions.d/actions_tor.conf
index b1c30a13f..bb9387df6 100644
--- a/net/tor/src/opnsense/service/conf/actions.d/actions_tor.conf
+++ b/net/tor/src/opnsense/service/conf/actions.d/actions_tor.conf
@@ -33,4 +33,3 @@ command:/usr/local/opnsense/service/scripts/tor/get_hostnames
 parameters:
 type:script_output
 message:query hostnames of hidden services
-
diff --git a/net/tor/src/opnsense/service/scripts/tor/setup.sh b/net/tor/src/opnsense/service/scripts/tor/setup.sh
index b7464dde9..c7680cb15 100755
--- a/net/tor/src/opnsense/service/scripts/tor/setup.sh
+++ b/net/tor/src/opnsense/service/scripts/tor/setup.sh
@@ -5,5 +5,3 @@ mkdir -p /var/run/tor
 
 # required to access the pf device for nat
 /usr/sbin/pw groupmod proxy -m _tor
-
-
diff --git a/net/tor/src/opnsense/service/scripts/tor/tor_helper.php b/net/tor/src/opnsense/service/scripts/tor/tor_helper.php
index 3bcb37884..f05179572 100644
--- a/net/tor/src/opnsense/service/scripts/tor/tor_helper.php
+++ b/net/tor/src/opnsense/service/scripts/tor/tor_helper.php
@@ -1,4 +1,3 @@
 <?php
 
 define('TOR_DATA_DIR', '/var/db/tor');
-
diff --git a/net/tor/src/opnsense/service/templates/OPNsense/Tor/torrc b/net/tor/src/opnsense/service/templates/OPNsense/Tor/torrc
index c40a77d37..6e55f4c6d 100644
--- a/net/tor/src/opnsense/service/templates/OPNsense/Tor/torrc
+++ b/net/tor/src/opnsense/service/templates/OPNsense/Tor/torrc
@@ -159,10 +159,10 @@ ExitPolicyRejectPrivate {{ OPNsense.tor.relay.exitrejectprivateip }}
 {%     for policy in helpers.toList('OPNsense.tor.exitpolicy.policy') %}
 {%       if policy.enabled == '1' %}
 ExitPolicy {{ policy.action }}{% if policy.type == 'v6' %}6{% endif
-            %} {% if policy.network == '' %}*{% if 'v' in policy.type %}{{ policy.type|replace('v','') }}{% endif%}{% else 
-            %}{{ policy.network }}{% endif 
-            %}{% if 'startport' in policy %}:{{ policy.startport 
-              }}{% if 'endport' in policy %}-{{ policy.endport }}{% endif 
+            %} {% if policy.network == '' %}*{% if 'v' in policy.type %}{{ policy.type|replace('v','') }}{% endif%}{% else
+            %}{{ policy.network }}{% endif
+            %}{% if 'startport' in policy %}:{{ policy.startport
+              }}{% if 'endport' in policy %}-{{ policy.endport }}{% endif
             %}{% endif %}
 
 {%       endif %}