Skip to content

Commit

Permalink
Make Tor socks port default to 9050
Browse files Browse the repository at this point in the history
  • Loading branch information
@waybackarchiver
waybackarchiver committed Oct 23, 2021
1 parent b6f3e8a commit 3b41c3a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
10 changes: 6 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ RUN --mount=type=bind,target=/src,rw \
--mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
sh ./build/binary.sh $TARGETPLATFORM \
&& rm -rf .build/binary/wayback-* \
&& mv ./build/binary/wayback-* /wayback

# Application layer
Expand Down Expand Up @@ -51,15 +52,16 @@ RUN set -o pipefail; \
apk add --no-cache -U ca-certificates libressl wget tor; \
rm -rf /var/cache/apk/*; \
\
mv /etc/tor/torrc.sample /etc/tor/torrc; \
cp /etc/tor/torrc.sample /etc/tor/torrc; \
#echo "ExcludeNodes ${TOR_EXCLUDE_NODE}" >> /etc/tor/torrc; \
#echo "ExcludeExitNodes ${TOR_EXCLUDE_EXIT_NODE}" >> /etc/tor/torrc; \
#echo 'StrictNodes 1' >> /etc/tor/torrc; \
echo 'SocksPort 0' >> /etc/tor/torrc; \
echo 'SocksPort 9050' >> /etc/tor/torrc; \
echo 'ExitRelay 0' >> /etc/tor/torrc; \
echo 'LongLivedPorts 8964' >> /etc/tor/torrc; \
#echo 'User tor' >> /etc/tor/torrc; \
chmod a+w /var/log/tor
echo 'User tor' >> /etc/tor/torrc; \
chown tor:nogroup /var/lib/tor/ /var/log/tor/; \
chmod 700 /var/lib/tor

EXPOSE 8964

Expand Down
10 changes: 6 additions & 4 deletions build/docker/Dockerfile.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ RUN --mount=type=bind,target=/src,rw \
--mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
sh ./build/binary.sh $TARGETPLATFORM \
&& rm -rf .build/binary/wayback-* \
&& mv ./build/binary/wayback-* /wayback

# Application layer
Expand Down Expand Up @@ -51,15 +52,16 @@ RUN set -o pipefail; \
apk add --no-cache -U ca-certificates libressl wget tor; \
rm -rf /var/cache/apk/*; \
\
mv /etc/tor/torrc.sample /etc/tor/torrc; \
cp /etc/tor/torrc.sample /etc/tor/torrc; \
#echo "ExcludeNodes ${TOR_EXCLUDE_NODE}" >> /etc/tor/torrc; \
#echo "ExcludeExitNodes ${TOR_EXCLUDE_EXIT_NODE}" >> /etc/tor/torrc; \
#echo 'StrictNodes 1' >> /etc/tor/torrc; \
echo 'SocksPort 0' >> /etc/tor/torrc; \
echo 'SocksPort 9050' >> /etc/tor/torrc; \
echo 'ExitRelay 0' >> /etc/tor/torrc; \
echo 'LongLivedPorts 8964' >> /etc/tor/torrc; \
#echo 'User tor' >> /etc/tor/torrc; \
chmod a+w /var/log/tor
echo 'User tor' >> /etc/tor/torrc; \
chown tor:nogroup /var/lib/tor/ /var/log/tor/; \
chmod 700 /var/lib/tor

# Ref: https://wiki.alpinelinux.org/wiki/Fonts
RUN set -o pipefail; \
Expand Down
10 changes: 6 additions & 4 deletions build/docker/Dockerfile.dev
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ WORKDIR /src
COPY . .
RUN set -eu && \
sh ./build/binary.sh $TARGETPLATFORM \
&& rm -rf .build/binary/wayback-* \
&& mv ./build/binary/wayback-* /wayback

# Application layer
Expand Down Expand Up @@ -43,15 +44,16 @@ RUN set -o pipefail; \
apk add --no-cache -U ca-certificates libressl wget tor; \
rm -rf /var/cache/apk/*; \
\
mv /etc/tor/torrc.sample /etc/tor/torrc; \
cp /etc/tor/torrc.sample /etc/tor/torrc; \
#echo "ExcludeNodes ${TOR_EXCLUDE_NODE}" >> /etc/tor/torrc; \
#echo "ExcludeExitNodes ${TOR_EXCLUDE_EXIT_NODE}" >> /etc/tor/torrc; \
#echo 'StrictNodes 1' >> /etc/tor/torrc; \
echo 'SocksPort 0' >> /etc/tor/torrc; \
echo 'SocksPort 9050' >> /etc/tor/torrc; \
echo 'ExitRelay 0' >> /etc/tor/torrc; \
echo 'LongLivedPorts 8964' >> /etc/tor/torrc; \
#echo 'User tor' >> /etc/tor/torrc; \
chmod a+w /var/log/tor
echo 'User tor' >> /etc/tor/torrc; \
chown tor:nogroup /var/lib/tor/ /var/log/tor/; \
chmod 700 /var/lib/tor

EXPOSE 8964

Expand Down

1 comment on commit 3b41c3a

@waybackarchiver
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ref #92 (comment)

Please sign in to comment.