From 19043bb281c92e90e220d60c83f99cadd8da34ca Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 20 Oct 2017 19:04:54 +0000
Subject: [PATCH] tor: fix setup.sh, wrong directory structure

PR: https://forum.opnsense.org/index.php?topic=6207.0
---
 security/tor/src/opnsense/{service => }/scripts/tor/gen_key   | 0
 .../tor/src/opnsense/{service => }/scripts/tor/get_hostnames  | 0
 .../{service => }/scripts/tor/make_hidden_service_dirs.php    | 0
 security/tor/src/opnsense/{service => }/scripts/tor/setup.sh  | 2 +-
 .../tor/src/opnsense/{service => }/scripts/tor/tor_helper.php | 0
 .../tor/src/opnsense/service/conf/actions.d/actions_tor.conf  | 4 ++--
 security/tor/src/opnsense/service/templates/OPNsense/Tor/tor  | 2 +-
 7 files changed, 4 insertions(+), 4 deletions(-)
 rename security/tor/src/opnsense/{service => }/scripts/tor/gen_key (100%)
 rename security/tor/src/opnsense/{service => }/scripts/tor/get_hostnames (100%)
 rename security/tor/src/opnsense/{service => }/scripts/tor/make_hidden_service_dirs.php (100%)
 rename security/tor/src/opnsense/{service => }/scripts/tor/setup.sh (83%)
 rename security/tor/src/opnsense/{service => }/scripts/tor/tor_helper.php (100%)

diff --git a/security/tor/src/opnsense/service/scripts/tor/gen_key b/security/tor/src/opnsense/scripts/tor/gen_key
similarity index 100%
rename from security/tor/src/opnsense/service/scripts/tor/gen_key
rename to security/tor/src/opnsense/scripts/tor/gen_key
diff --git a/security/tor/src/opnsense/service/scripts/tor/get_hostnames b/security/tor/src/opnsense/scripts/tor/get_hostnames
similarity index 100%
rename from security/tor/src/opnsense/service/scripts/tor/get_hostnames
rename to security/tor/src/opnsense/scripts/tor/get_hostnames
diff --git a/security/tor/src/opnsense/service/scripts/tor/make_hidden_service_dirs.php b/security/tor/src/opnsense/scripts/tor/make_hidden_service_dirs.php
similarity index 100%
rename from security/tor/src/opnsense/service/scripts/tor/make_hidden_service_dirs.php
rename to security/tor/src/opnsense/scripts/tor/make_hidden_service_dirs.php
diff --git a/security/tor/src/opnsense/service/scripts/tor/setup.sh b/security/tor/src/opnsense/scripts/tor/setup.sh
similarity index 83%
rename from security/tor/src/opnsense/service/scripts/tor/setup.sh
rename to security/tor/src/opnsense/scripts/tor/setup.sh
index 64d47797d..3e1b78e51 100755
--- a/security/tor/src/opnsense/service/scripts/tor/setup.sh
+++ b/security/tor/src/opnsense/scripts/tor/setup.sh
@@ -13,7 +13,7 @@ chown _tor:_tor /var/log/tor.log
 chown _tor:_tor /var/run/tor
 
 # create Onion service dirs:
-/usr/local/opnsense/service/scripts/tor/make_hidden_service_dirs.php
+/usr/local/opnsense/scripts/tor/make_hidden_service_dirs.php
 
 # required to access the pf device for nat
 /usr/sbin/pw groupmod proxy -m _tor
diff --git a/security/tor/src/opnsense/service/scripts/tor/tor_helper.php b/security/tor/src/opnsense/scripts/tor/tor_helper.php
similarity index 100%
rename from security/tor/src/opnsense/service/scripts/tor/tor_helper.php
rename to security/tor/src/opnsense/scripts/tor/tor_helper.php
diff --git a/security/tor/src/opnsense/service/conf/actions.d/actions_tor.conf b/security/tor/src/opnsense/service/conf/actions.d/actions_tor.conf
index 208d024e5..1eab63721 100644
--- a/security/tor/src/opnsense/service/conf/actions.d/actions_tor.conf
+++ b/security/tor/src/opnsense/service/conf/actions.d/actions_tor.conf
@@ -23,13 +23,13 @@ type:script_output
 message:request tor status
 
 [genkey]
-command:/usr/local/opnsense/service/scripts/tor/gen_key
+command:/usr/local/opnsense/scripts/tor/gen_key
 parameters:
 type:script_output
 message:generate Tor control key
 
 [gethostnames]
-command:/usr/local/opnsense/service/scripts/tor/get_hostnames
+command:/usr/local/opnsense/scripts/tor/get_hostnames
 parameters:
 type:script_output
 message:Query hostnames of Onion services
diff --git a/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor b/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor
index a9d9b84b2..40f2137ca 100644
--- a/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor
+++ b/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor
@@ -1,6 +1,6 @@
 {% if helpers.exists('OPNsense.tor.general.enabled') and OPNsense.tor.general.enabled == '1' %}
 tor_enable="YES"
-tor_opnsense_bootup_run="/usr/local/opnsense/service/scripts/tor/setup.sh"
+tor_opnsense_bootup_run="/usr/local/opnsense/scripts/tor/setup.sh"
 {% else %}
 tor_enable="NO"
 {% endif %}