Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13006 from ja-pa/tor-backport-conf

Browse source 
[OpenWrt 19.07] tor: backport uci config
This commit is contained in:
Rosen Penev 2020-08-03 15:59:08 -07:00 committed by GitHub
commit 9f9152e3e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/tor/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tor
PKG_VERSION:=0.4.2.8
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://dist.torproject.org/ \
@ -89,6 +89,7 @@ define Package/tor/conffiles
/etc/tor/torrc
/var/lib/tor/fingerprint
/var/lib/tor/keys/*
/etc/config/tor
endef
CONFIGURE_ARGS += \
@ -124,6 +125,8 @@ define Package/tor/install
$(INSTALL_BIN) ./files/tor.init $(1)/etc/init.d/tor
$(INSTALL_DIR) $(1)/etc/tor
$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/tor/torrc.sample $(1)/etc/tor/torrc
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/tor.conf $(1)/etc/config/tor
endef
define Package/tor-gencert/install

5
net/tor/files/tor.conf Normal file
View file

@ -0,0 +1,5 @@
config tor conf
option default "/etc/tor/torrc"
option generated "/tmp/torrc"
#list head_include "/full/path/to/file"
#list tail_include "/full/path/to/file"

35
net/tor/files/tor.init
View file

@ -6,18 +6,47 @@ STOP=50
USE_PROCD=1
start_service() {
touch /var/run/tor.pid
chown tor:tor /var/run/tor.pid
TORRC_GEN="/tmp/torrc"
handle_conf_file() {
local conf_path="$1"
if [ -f "$conf_path" ] || [ -d "$conf_path" ]; then
echo "%include $conf_path"
fi
}
generate_conf() {
local default_conf generated_conf
config_load tor
config_get default_conf conf default "/etc/tor/torrc"
config_get generated_conf conf generated "/tmp/torrc"
TORRC_GEN="$generated_conf"
{
echo "## This file was automatically generated please do not edit here !"
config_list_foreach "conf" head_include handle_conf_file
echo "%include $default_conf"
config_list_foreach "conf" tail_include handle_conf_file
} > "$TORRC_GEN"
}
reload_service() {
procd_send_signal /usr/sbin/tor
}
start_service() {
mkdir -m 0700 -p /var/lib/tor
chown -R tor:tor /var/lib/tor
mkdir -m 0755 -p /var/log/tor
chown -R tor:tor /var/log/tor
generate_conf
procd_open_instance
procd_set_param command /usr/sbin/tor --runasdaemon 0
procd_append_param command -f "$TORRC_GEN"
procd_set_param respawn
procd_close_instance
}