diff options
author | Linus Nordberg <linus@nordu.net> | 2017-09-25 00:33:49 +0200 |
---|---|---|
committer | Linus Nordberg <linus@nordu.net> | 2017-09-25 00:33:49 +0200 |
commit | 14c903cdd694d9d5a92905658bfb7176fe016aff (patch) | |
tree | 401223c7b0bc8cb0eece6c7402455e7f7eaa5012 | |
parent | 980d08df1590ca84f18c4666dd01c93dd6831c5a (diff) |
It lives in nunoc-dockerfiles nowadays.
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | onion/Dockerfile | 11 | ||||
-rw-r--r-- | onion/start.sh | 23 |
3 files changed, 0 insertions, 37 deletions
@@ -7,9 +7,6 @@ catlfish-build: catlfish-dev catlfish-dev-lunahsm: docker build --no-cache --rm -t $@:latest $@ -onion: - docker build --no-cache --rm -t $@:latest $@ - catlfish: FIXME diff --git a/onion/Dockerfile b/onion/Dockerfile deleted file mode 100644 index df2caed..0000000 --- a/onion/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM base -RUN apt-get update -RUN echo 'debconf debconf/frontend select noninteractive' | debconf-set-selections -RUN apt-get -y -q install tor -RUN systemctl disable tor -ADD start.sh /start.sh -RUN chmod a+rx /start.sh -VOLUME /etc/tor -VOLUME /var/lib/tor/hs -RUN chown -R debian-tor:debian-tor /var/lib/tor/hs -ENTRYPOINT ["/start.sh"] diff --git a/onion/start.sh b/onion/start.sh deleted file mode 100644 index a4dca97..0000000 --- a/onion/start.sh +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/sh - -# BACKEND_PORT is set by `docker run --link BACKEND:foo' on the form -# tcp://<ip>:<port>. See https://docs.docker.com/userguide/dockerlinks/. - -if [ -n "${HSPORT}" ]; then - HSPORT=80 # Default localhost:80 -> .onion:80 - if [ -n "${BACKEND_PORT}" ]; then - HSPORT="80 "$(echo ${BACKEND_PORT} | sed 's|^.*://||1') - fi -fi - -if ! [ -e /etc/tor/torrc ]; then - echo "SocksPort 0" >> /etc/tor/torrc - echo "DataDirectory /var/lib/tor" >> /etc/tor/torrc - echo "HiddenServiceDir /var/lib/tor/hs" >> /etc/tor/torrc - echo "HiddenServicePort ${HSPORT}" >> /etc/tor/torrc - echo "# For a non-anonymous Single Onion Service, uncomment the next two lines." >> /etc/tor/torrc - echo "#HiddenServiceSingleHopMode 1" >> /etc/tor/torrc - echo "#HiddenServiceNonAnonymousMode 1" >> /etc/tor/torrc -fi - -/usr/bin/tor -f /etc/tor/torrc --user debian-tor |