From 9b21826620b560f661dbac813f186ad0fa9cbee4 Mon Sep 17 00:00:00 2001 From: Daniel Winzen Date: Tue, 12 Oct 2021 08:29:01 +0200 Subject: [PATCH] Due to running other than web services, we can't make use of the proxy protocol on the main onion --- etc/tor/torrc | 1 - var/www/common.php | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/etc/tor/torrc b/etc/tor/torrc index 5b0f351..788cc62 100644 --- a/etc/tor/torrc +++ b/etc/tor/torrc @@ -11,7 +11,6 @@ HiddenServiceNumIntroductionPoints 5 HiddenServiceEnableIntroDoSDefense 1 HiddenServiceEnableIntroDoSRatePerSec 10 HiddenServiceEnableIntroDoSBurstPerSec 100 -HiddenServiceExportCircuitID haproxy ClientUseIPv6 1 ClientUseIPv4 1 diff --git a/var/www/common.php b/var/www/common.php index 441102f..6db498c 100644 --- a/var/www/common.php +++ b/var/www/common.php @@ -67,7 +67,7 @@ const NGINX_DEFAULT = 'server { } server { listen [::]:80 ipv6only=off fastopen=100 backlog=2048 default_server; - listen unix:/var/run/nginx.sock backlog=2048 proxy_protocol default_server; + listen unix:/var/run/nginx.sock backlog=2048 default_server; root /var/www/html; index index.php; server_name ' . ADDRESS . ' *.' . ADDRESS . '; @@ -397,9 +397,7 @@ HiddenServiceVersion $tmp[version] HiddenServiceMaxStreamsCloseCircuit 1 HiddenServiceMaxStreams $tmp[max_streams] HiddenServiceExportCircuitID haproxy -"; - if($tmp['version']=='3'){ - $torrc.="HiddenServiceEnableIntroDoSDefense 1 +HiddenServiceEnableIntroDoSDefense 1 HiddenServiceEnableIntroDoSRatePerSec 10 HiddenServiceEnableIntroDoSBurstPerSec 100 ";