fix: move default config into ./demo.d, fix up docs

pull/110/head
Spencer Koch 2022-12-27 15:09:14 -06:00
rodzic 58166bdde3
commit e53070edae
3 zmienionych plików z 33 dodań i 1 usunięć

Wyświetl plik

@ -1,6 +1,12 @@
# directories we don't need in final build
deployment.d/
demo.d/
docs.d/
# we do need the example-dev.tconf as a fallback config
!demo.d/example-dev.tconf
# files we don't need
.git
.gitignore
Makefile

Wyświetl plik

@ -0,0 +1,25 @@
set nginx_resolver 9.9.9.9 1.1.1.1 ipv6=off
# index of other onion sites ("what happens in onion, should stay in onion")
foreignmap facebookwkhpilnemxj7asaniu7vnjjbiltxjqhye3mhbshg7kx5tfyd facebook.com
foreignmap twitter3e4tixl4xyajtrzo62zg5vztmjuricljdp2c5kshju4avyoid twitter.com
foreignmap p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd.onion propublica.com
foreignmap bbcnewsd73hkzno2ini43t4gblxvycyac5aw4gnv7t2rccijh7745uqd.onion bbc.com
foreignmap 27m3p2uv7igmj6kvd4ql3cct5h3sdwrsajovkkndeufumzyfhlfev4qd.onion theintercept.com
# use mkcert for development purposes
set ssl_mkcert 1
# use stdout for logging
set log_stdout 1
set nginx_cache_seconds 3600
set nginx_cache_size 1000m
set nginx_tmpfile_size 1000m
set extra_subs_filter_types application/dash+xml application/x-www-form-urlencoded
set project example-dev
# in dev, we randomly generate onion addresses since these are short lived
hardmap %NEW_V3_ONION% example.com

Wyświetl plik

@ -65,11 +65,12 @@ COPY ./opt.d/ $EOTK_HOME/opt.d/
RUN $EOTK_HOME/opt.d/build-docker.sh
# Copy remaining source material filtered by .dockerignore
COPY ./ ${EOTK_HOME}
# Move the default config, which is expected to be in $EOTK_HOME (put your config in repo root)
RUN mv ${EOTK_HOME}/demo.d/example-dev.tconf ${EOTK_HOME}/example-dev.tconf
# Move dhparams file to shared location
COPY ./dhparams.pem /etc/nginx/dhparams.pem
# do mkcert setup - not used in prod
RUN if [ "$MKCERT" = "true" ] ; then curl -JLO "https://dl.filippo.io/mkcert/${MKCERT_VERSION}?for=linux/amd64" \
&& sha256sum -c ${EOTK_HOME}/tools.d/mkcert-${MKCERT_VERSION}.sha256sum \
&& chmod +x mkcert-${MKCERT_VERSION}-linux-amd64 \