AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Make sure no hidden service dir if no hidden port

Browse Source
This commit is contained in:
nicolas.dorier
2019-03-18 18:28:28 +09:00
parent bf708ce271
commit 80ca5102e3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Generated/torrc.tmpl
View File

@@ -1,8 +1,7 @@
{{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }} {{ $CurrentContainer := where $ "ID" .Docker.CurrentContainerID | first }}
{{ range $name, $containers := groupByMulti $ "Env.HIDDENSERVICE_NAME" "," }} {{ range $name, $containers := groupByMulti $ "Env.HIDDENSERVICE_NAME" "," }}
# For the hidden service {{ $name }} {{ $firstServicePort := true }}
HiddenServiceDir /var/lib/tor/hidden_services/{{ $name }}
{{ range $container := $containers }} {{ range $container := $containers }}
{{ range $knownNetwork := $CurrentContainer.Networks }} {{ range $knownNetwork := $CurrentContainer.Networks }}
{{ range $containerNetwork := $container.Networks }} {{ range $containerNetwork := $container.Networks }}
@@ -14,6 +13,11 @@ HiddenServiceDir /var/lib/tor/hidden_services/{{ $name }}
{{ $port := coalesce $container.Env.HIDDENSERVICE_PORT "80" }} {{ $port := coalesce $container.Env.HIDDENSERVICE_PORT "80" }}
{{ $virtualPort := coalesce $container.Env.HIDDENSERVICE_VIRTUAL_PORT $port }} {{ $virtualPort := coalesce $container.Env.HIDDENSERVICE_VIRTUAL_PORT $port }}
{{ if ne $containerNetwork.IP "" }} {{ if ne $containerNetwork.IP "" }}
{{ if $firstServicePort }}
# For the hidden service {{ $name }}
HiddenServiceDir /var/lib/tor/hidden_services/{{ $name }}
{{ $firstServicePort := false }}
{{ end }}
# Redirecting to {{ $containerOrReverseProxyName }} # Redirecting to {{ $containerOrReverseProxyName }}
HiddenServicePort {{ $virtualPort }} {{ $containerNetwork.IP }}:{{ $port }} HiddenServicePort {{ $virtualPort }} {{ $containerNetwork.IP }}:{{ $port }}
{{ end }} {{ end }}