tor: fix setup.sh, wrong directory structure

PR: https://forum.opnsense.org/index.php?topic=6207.0
opnsense · Oct 20, 2017 · 19043bb · 19043bb · fichtner · Oct 20, 2017
1 parent 463dd0b
commit 19043bb
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 4 deletions.
diff --git a/.../src/opnsense/service/scripts/tor/gen_key → ...rity/tor/src/opnsense/scripts/tor/gen_key b/.../src/opnsense/service/scripts/tor/gen_key → ...rity/tor/src/opnsense/scripts/tor/gen_key
diff --git a/...pnsense/service/scripts/tor/get_hostnames → ...or/src/opnsense/scripts/tor/get_hostnames b/...pnsense/service/scripts/tor/get_hostnames → ...or/src/opnsense/scripts/tor/get_hostnames
diff --git a/.../scripts/tor/make_hidden_service_dirs.php → .../scripts/tor/make_hidden_service_dirs.php b/.../scripts/tor/make_hidden_service_dirs.php → .../scripts/tor/make_hidden_service_dirs.php
diff --git a/...src/opnsense/service/scripts/tor/setup.sh → ...ity/tor/src/opnsense/scripts/tor/setup.sh b/...src/opnsense/service/scripts/tor/setup.sh → ...ity/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/...nsense/service/scripts/tor/tor_helper.php → ...r/src/opnsense/scripts/tor/tor_helper.php b/...nsense/service/scripts/tor/tor_helper.php → ...r/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
@@ -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
@@ -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 %}