Merge branch 'master' of git.openprivacy.ca:cwtch.im/cwtch

This commit is contained in:
Dan Ballard 2018-11-02 14:01:04 -07:00
commit b145420f21
2 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -29,8 +29,8 @@ RUN apk --no-cache add --update \
zstd \
zstd-dev \
&& wget -q https://www.torproject.org/dist/tor-0.3.5.3-alpha.tar.gz \
&& tar xf tor-0.3.5.2-alpha.tar.gz \
&& cd tor-0.3.5.2-alpha \
&& tar xf tor-0.3.5.3-alpha.tar.gz \
&& cd tor-0.3.5.3-alpha \
&& ./configure \
&& make install \
&& ls -R /usr/local/

Wyświetl plik

@ -26,7 +26,7 @@ tor -f /etc/tor/torrc
sleep 15
if [ -z "${CWTCH_CONFIG_DIR}" ]; then
CWTCH_CONFIG_DIR=/etc/CWTCH/
CWTCH_CONFIG_DIR=/etc/cwtch/
fi
#Run cwtch (or whatever the user passed)