🗃️ Committing everything that changed 🗃️
Some checks are pending
release-tag / release-image (push) Waiting to run

Dockerfile
rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh
rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh
This commit is contained in:
casjay 2025-01-06 17:14:41 -05:00
parent 5cfac94cb4
commit 7f3c5b245d
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
3 changed files with 14 additions and 11 deletions

View File

@ -15,7 +15,7 @@ ARG USER="root"
ARG SHELL_OPTS="set -e -o pipefail" ARG SHELL_OPTS="set -e -o pipefail"
ARG SERVICE_PORT="80" ARG SERVICE_PORT="80"
ARG EXPOSE_PORTS="80 8118 9040 9050 9053 9080 58000-58004" ARG EXPOSE_PORTS="80 8118 9040 9050 9053 9080 57000-57010"
ARG PHP_VERSION="system" ARG PHP_VERSION="system"
ARG NODE_VERSION="system" ARG NODE_VERSION="system"
ARG NODE_MANAGER="system" ARG NODE_MANAGER="system"

View File

@ -263,14 +263,17 @@ Log notice file $LOG_DIR/tor-relay.log
SOCKSPort 10051 SOCKSPort 10051
ServerTransportPlugin obfs4 exec /usr/bin/lyrebird ServerTransportPlugin obfs4 exec /usr/bin/lyrebird
ServerTransportListenAddr obfs4 0.0.0.0:${TOR_RELAY_PORT:-58004} ServerTransportListenAddr obfs4 0.0.0.0:${TOR_RELAY_PORT:-57000}
ORPort ${TOR_RELAY_OR_PORT:-57001}
DirPort ${TOR_RELAY_DIR_PORT:-57002}
BridgeRelay 0 BridgeRelay 0
PublishServerDescriptor 1 PublishServerDescriptor 1
ContactInfo ${TOR_ADMIN:-tor-admin@$HOSTNAME} ContactInfo ${TOR_RELAY_ADMIN:-tor-admin@$HOSTNAME}
Nickname ${TOR_NICK_NAME:-$RANDOM_NICK}-relay Nickname ${TOR_RELAY_NICK_NAME:-$RANDOM_NICK}
AccountingMax ${TOR_ACCOUNT_MAX:-1000} GBytes AccountingMax ${TOR_RELAY_ACCOUNT_MAX:-1000}
AccountingStart month 1 00:00 AccountingStart month 1 00:00
DirPortFrontPage /usr/share/tor/html/exit.html
%include $CONF_DIR/conf.d/*.conf %include $CONF_DIR/conf.d/*.conf
EOF EOF

View File

@ -263,17 +263,17 @@ Log notice file $LOG_DIR/tor-bridge.log
SOCKSPort 10052 SOCKSPort 10052
ServerTransportPlugin obfs4 exec /usr/bin/lyrebird ServerTransportPlugin obfs4 exec /usr/bin/lyrebird
ServerTransportListenAddr obfs4 0.0.0.0:${TOR_BRIDGE_PT_PORT:-58000} ServerTransportListenAddr obfs4 0.0.0.0:${TOR_BRIDGE_PT_PORT:-57003}
ORPort ${TOR_BRIDGE_OR_PORT:-57004}
DirPort ${TOR_BRIDGE_DIR_PORT:-57005}
Nickname ${TOR_BRIDGE_NICK_NAME:-$RANDOM_NICK}
ContactInfo ${TOR_BRIDGE_ADMIN:-tor-admin@$HOSTNAME}
AccountingMax ${TOR_BRIDGE_ACCOUNT_MAX:-1000}
BridgeRelay 1 BridgeRelay 1
PublishServerDescriptor 1 PublishServerDescriptor 1
ExtORPort auto ExtORPort auto
Exitpolicy accept *:* Exitpolicy accept *:*
ORPort ${TOR_BRIDGE_OR_PORT:-58001}
DirPort ${TOR_BRIDGE_DIR_PORT:-58002}
Nickname ${TOR_NICK_NAME:-$RANDOM_NICK}
ContactInfo ${TOR_ADMIN:-tor-admin@$HOSTNAME}
AccountingMax ${TOR_ACCOUNT_MAX:-1000} GBytes
AccountingStart month 1 00:00 AccountingStart month 1 00:00
DirPortFrontPage /usr/share/tor/html/exit.html DirPortFrontPage /usr/share/tor/html/exit.html
%include $CONF_DIR/conf.d/*.conf %include $CONF_DIR/conf.d/*.conf