From 47aba5f0540b10f319b9d38455c502e7559c46da Mon Sep 17 00:00:00 2001 From: Dryusdan Date: Sat, 21 Oct 2017 18:03:42 +0200 Subject: [PATCH] change name of reverse nginx --- builder.sh | 2 +- reverse-nginx/rootfs/etc/s6.d/tor/run | 3 -- reverse-proxy/.Dockerfile.swp | Bin 0 -> 12288 bytes {reverse-nginx => reverse-proxy}/.drone.yml | 0 {reverse-nginx => reverse-proxy}/Dockerfile | 2 +- {reverse-nginx => reverse-proxy}/README.md | 0 .../auto_upgrade.sh | 0 .../docker-compose.yml | 0 .../rootfs/etc/s6.d/.s6-svscan/finish | 0 .../rootfs/etc/s6.d/check_certs/run | 0 .../rootfs/etc/s6.d/nginx/run | 0 reverse-proxy/rootfs/etc/s6.d/tor/run | 3 ++ .../rootfs/etc/tor/torrc | 0 .../rootfs/nginx/conf.d/headers.conf | 0 .../rootfs/nginx/conf.d/proxy.conf | 0 .../rootfs/nginx/conf.d/ssl.conf | 0 .../rootfs/nginx/conf/nginx.conf | 0 .../rootfs/nginx/path.d/template | 0 .../rootfs/nginx/path.d/template_auth | 0 .../rootfs/nginx/sites-enabled/template | 4 +-- .../rootfs/nginx/sites-enabled/template_ssl | 8 ++--- .../rootfs/nginx/www/letsencrypt | 0 .../rootfs/usr/local/bin/check_certs | 0 .../rootfs/usr/local/bin/startup | 30 ++++++++++-------- 24 files changed, 28 insertions(+), 24 deletions(-) delete mode 100644 reverse-nginx/rootfs/etc/s6.d/tor/run create mode 100644 reverse-proxy/.Dockerfile.swp rename {reverse-nginx => reverse-proxy}/.drone.yml (100%) rename {reverse-nginx => reverse-proxy}/Dockerfile (99%) rename {reverse-nginx => reverse-proxy}/README.md (100%) rename {reverse-nginx => reverse-proxy}/auto_upgrade.sh (100%) rename {reverse-nginx => reverse-proxy}/docker-compose.yml (100%) rename {reverse-nginx => reverse-proxy}/rootfs/etc/s6.d/.s6-svscan/finish (100%) rename {reverse-nginx => reverse-proxy}/rootfs/etc/s6.d/check_certs/run (100%) rename {reverse-nginx => reverse-proxy}/rootfs/etc/s6.d/nginx/run (100%) create mode 100644 reverse-proxy/rootfs/etc/s6.d/tor/run rename {reverse-nginx => reverse-proxy}/rootfs/etc/tor/torrc (100%) rename {reverse-nginx => reverse-proxy}/rootfs/nginx/conf.d/headers.conf (100%) rename {reverse-nginx => reverse-proxy}/rootfs/nginx/conf.d/proxy.conf (100%) rename {reverse-nginx => reverse-proxy}/rootfs/nginx/conf.d/ssl.conf (100%) rename {reverse-nginx => reverse-proxy}/rootfs/nginx/conf/nginx.conf (100%) rename {reverse-nginx => reverse-proxy}/rootfs/nginx/path.d/template (100%) rename {reverse-nginx => reverse-proxy}/rootfs/nginx/path.d/template_auth (100%) rename {reverse-nginx => reverse-proxy}/rootfs/nginx/sites-enabled/template (89%) rename {reverse-nginx => reverse-proxy}/rootfs/nginx/sites-enabled/template_ssl (81%) rename {reverse-nginx => reverse-proxy}/rootfs/nginx/www/letsencrypt (100%) rename {reverse-nginx => reverse-proxy}/rootfs/usr/local/bin/check_certs (100%) rename {reverse-nginx => reverse-proxy}/rootfs/usr/local/bin/startup (85%) diff --git a/builder.sh b/builder.sh index 01debfd..08be293 100755 --- a/builder.sh +++ b/builder.sh @@ -53,5 +53,5 @@ else f_build_and_push $directory $FORCE_BUILD fi done - #git push --mirror git@github.com:Dryusdan/Dockerfiles.git + git push --mirror git@github.com:Dryusdan/Dockerfiles.git fi diff --git a/reverse-nginx/rootfs/etc/s6.d/tor/run b/reverse-nginx/rootfs/etc/s6.d/tor/run deleted file mode 100644 index a6585ac..0000000 --- a/reverse-nginx/rootfs/etc/s6.d/tor/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec tor diff --git a/reverse-proxy/.Dockerfile.swp b/reverse-proxy/.Dockerfile.swp new file mode 100644 index 0000000000000000000000000000000000000000..8c2135d0ac0a930059a09631b58a536296afc764 GIT binary patch literal 12288 zcmeHNO>88^6|M!s#%vZ4$ps0miq2+57OH!G{7W(fdp$Om)?>@N-s}R=sHeN8r|q7u zrn=f5J6dswqG<2YN>NUT1Dp_CK#G)ejvNqL$SEjN1e{QEj3VW${_)J(<6Xl63Dhlr zuI_s8)z9}{y(-Jqsa#uGr8DLv!SgtN>!u&E z>dZ8&S6OwoYVzc6ORFdP+;WAp&86jtP}zQnw@%^*uC&oRon?b=mCM&3dg`(I!7No~A#3V)LZdrC!NE$w0|K$w0|K$w0|K$w0|K z$-wu30TrDhuVWq$$h zUlWA<4R{;41%$u`FbA9iKKUUb?*nfDe*iep0_K2oz-i#C(-<3Y2lyQ@5B&FGLf!$c z0}Pk|{{90({tCPW+yb_MmjD8M`Vhtd>;W$WlRzE#8So!)`fuPf;2*$WfRyL&V4Rdg z{x%u7w7N)NF|3XsTJbcCcVfp5jpwLgapj=KbdBGTX6x$4jrFya)>W;V#L^0cV+Wa$ zvZYEQXp!di^|dQaI$N2o(Amk!I+n?1i#ol&aOtxHI^K{TbYxw$E|N=Y>o=&r4b+XP zMF_=n;R2O?%4C;XsvlVwskLL{QjhKQxMfG%Fv_*?L0ulu^S@o#T)Dj1UTm&kxk+Cw z#QmMDFD0Y}NXLxreiZOSwWI2~KTo9d47eu_Pa&;4XdiNqE9&{Gmvl@=^sNC8MbNbl zsricHMpD=JC}UnAI(9&NN=2sr6+dsG!)V(x{m|@+AP~D7-1Q}QR7{mj_;5OW5DBU1 z^4h{mt8spLZGHagOM0YZG_`(Hte%)Hkg#uS9aKu)NZ`4xQE#e4ss4JVd|1sg9fVoL;?Rg~7Gv#)!`lTy(JC zrAKv4h)i#PI5aQPgm!G@^ibkfm*3qx-p;gR=XmMiR=4?H%q7~SJ==_g2+VjpW(T#g z8N%_5!A(19Ej7+((_da+HinJu>iE!ZhL_VBnL>KFrM4Re!gjN&yNJjqnGW{AZ{M_) z;W!YY)Cok$)4`-MHw;=4@lf(u?O8o;ySN<3`ac~O3WRn}!hB8JG7qK@g+Inq_zLUstx{l2pE|uT)9b55ujA5KG zKH$zc$#hl)oW z_)3M^zIYhhMSP1yF}?WO9VvFPoZDG28>CPxO2**nJk+zadHhN^%I2ZYct28mZO`xK z-HjpmkVT*O)6LC2u|*sOzG^#x&qEcT*vd|n@I#jmPHf?Eabn$MH}?D!Ysb#lQI7B1 zF!Q6GV)Yho)n!ICOXGD5S@1abG1ZgEe&g~*-b5Nnu}V5^Y>_ItFYQ_AdHa5p8u-rr zxXBE5YA4e}ro5M8f_QJ_cb!3kCq)t+e2*gmt8AM^HgbHnEm<-N^F2$8#u69#?lC5i zjJ4oW3dsWD-DQXGtgCh^$BG}9&{#^)J&bKfXWL_~W1N-pZigpYU77Wb@y>57)8Q$m zVK5d+-t`ALCAmhH!qQ|vVu6jnVJuXZCTmmm`b>Rkc4>NPs#;l`tW{@br)rh?xw*Oe zeDzXgs7B&mQIP;<@Sa#u$8?} ze|d0@9Pa6<#h#;L# iv(ppR`P!u-q;?RY5p778Hr7^Y+NYJ(K3_Md$^QZCAkXgr literal 0 HcmV?d00001 diff --git a/reverse-nginx/.drone.yml b/reverse-proxy/.drone.yml similarity index 100% rename from reverse-nginx/.drone.yml rename to reverse-proxy/.drone.yml diff --git a/reverse-nginx/Dockerfile b/reverse-proxy/Dockerfile similarity index 99% rename from reverse-nginx/Dockerfile rename to reverse-proxy/Dockerfile index de25ecf..a959a4f 100644 --- a/reverse-nginx/Dockerfile +++ b/reverse-proxy/Dockerfile @@ -98,7 +98,7 @@ RUN export BUILD_DEPS="build-base \ COPY rootfs / RUN chmod +x /usr/local/bin/startup /etc/s6.d/*/* -EXPOSE 8080 8443 +EXPOSE 80 443 ENTRYPOINT ["/usr/local/bin/startup"] CMD ["/bin/s6-svscan", "/etc/s6.d"] diff --git a/reverse-nginx/README.md b/reverse-proxy/README.md similarity index 100% rename from reverse-nginx/README.md rename to reverse-proxy/README.md diff --git a/reverse-nginx/auto_upgrade.sh b/reverse-proxy/auto_upgrade.sh similarity index 100% rename from reverse-nginx/auto_upgrade.sh rename to reverse-proxy/auto_upgrade.sh diff --git a/reverse-nginx/docker-compose.yml b/reverse-proxy/docker-compose.yml similarity index 100% rename from reverse-nginx/docker-compose.yml rename to reverse-proxy/docker-compose.yml diff --git a/reverse-nginx/rootfs/etc/s6.d/.s6-svscan/finish b/reverse-proxy/rootfs/etc/s6.d/.s6-svscan/finish similarity index 100% rename from reverse-nginx/rootfs/etc/s6.d/.s6-svscan/finish rename to reverse-proxy/rootfs/etc/s6.d/.s6-svscan/finish diff --git a/reverse-nginx/rootfs/etc/s6.d/check_certs/run b/reverse-proxy/rootfs/etc/s6.d/check_certs/run similarity index 100% rename from reverse-nginx/rootfs/etc/s6.d/check_certs/run rename to reverse-proxy/rootfs/etc/s6.d/check_certs/run diff --git a/reverse-nginx/rootfs/etc/s6.d/nginx/run b/reverse-proxy/rootfs/etc/s6.d/nginx/run similarity index 100% rename from reverse-nginx/rootfs/etc/s6.d/nginx/run rename to reverse-proxy/rootfs/etc/s6.d/nginx/run diff --git a/reverse-proxy/rootfs/etc/s6.d/tor/run b/reverse-proxy/rootfs/etc/s6.d/tor/run new file mode 100644 index 0000000..cfc2fcb --- /dev/null +++ b/reverse-proxy/rootfs/etc/s6.d/tor/run @@ -0,0 +1,3 @@ +#!/bin/sh + +#exec tor -f /etc/tor/torrc diff --git a/reverse-nginx/rootfs/etc/tor/torrc b/reverse-proxy/rootfs/etc/tor/torrc similarity index 100% rename from reverse-nginx/rootfs/etc/tor/torrc rename to reverse-proxy/rootfs/etc/tor/torrc diff --git a/reverse-nginx/rootfs/nginx/conf.d/headers.conf b/reverse-proxy/rootfs/nginx/conf.d/headers.conf similarity index 100% rename from reverse-nginx/rootfs/nginx/conf.d/headers.conf rename to reverse-proxy/rootfs/nginx/conf.d/headers.conf diff --git a/reverse-nginx/rootfs/nginx/conf.d/proxy.conf b/reverse-proxy/rootfs/nginx/conf.d/proxy.conf similarity index 100% rename from reverse-nginx/rootfs/nginx/conf.d/proxy.conf rename to reverse-proxy/rootfs/nginx/conf.d/proxy.conf diff --git a/reverse-nginx/rootfs/nginx/conf.d/ssl.conf b/reverse-proxy/rootfs/nginx/conf.d/ssl.conf similarity index 100% rename from reverse-nginx/rootfs/nginx/conf.d/ssl.conf rename to reverse-proxy/rootfs/nginx/conf.d/ssl.conf diff --git a/reverse-nginx/rootfs/nginx/conf/nginx.conf b/reverse-proxy/rootfs/nginx/conf/nginx.conf similarity index 100% rename from reverse-nginx/rootfs/nginx/conf/nginx.conf rename to reverse-proxy/rootfs/nginx/conf/nginx.conf diff --git a/reverse-nginx/rootfs/nginx/path.d/template b/reverse-proxy/rootfs/nginx/path.d/template similarity index 100% rename from reverse-nginx/rootfs/nginx/path.d/template rename to reverse-proxy/rootfs/nginx/path.d/template diff --git a/reverse-nginx/rootfs/nginx/path.d/template_auth b/reverse-proxy/rootfs/nginx/path.d/template_auth similarity index 100% rename from reverse-nginx/rootfs/nginx/path.d/template_auth rename to reverse-proxy/rootfs/nginx/path.d/template_auth diff --git a/reverse-nginx/rootfs/nginx/sites-enabled/template b/reverse-proxy/rootfs/nginx/sites-enabled/template similarity index 89% rename from reverse-nginx/rootfs/nginx/sites-enabled/template rename to reverse-proxy/rootfs/nginx/sites-enabled/template index d82fd18..9577f8b 100644 --- a/reverse-nginx/rootfs/nginx/sites-enabled/template +++ b/reverse-proxy/rootfs/nginx/sites-enabled/template @@ -1,6 +1,6 @@ server { - listen 8080; + listen 80; server_name ; include /nginx/conf.d/headers.conf; include /nginx/path.d//*.conf; -} \ No newline at end of file +} diff --git a/reverse-nginx/rootfs/nginx/sites-enabled/template_ssl b/reverse-proxy/rootfs/nginx/sites-enabled/template_ssl similarity index 81% rename from reverse-nginx/rootfs/nginx/sites-enabled/template_ssl rename to reverse-proxy/rootfs/nginx/sites-enabled/template_ssl index 70a6fc5..5434f93 100644 --- a/reverse-nginx/rootfs/nginx/sites-enabled/template_ssl +++ b/reverse-proxy/rootfs/nginx/sites-enabled/template_ssl @@ -1,6 +1,6 @@ server { - listen 8080; - server_name ; + listen 80; + server_name ; rewrite ^ https://:443$request_uri? permanent; } @@ -8,8 +8,8 @@ server { server { - listen 8443 ssl http2; - server_name ; + listen 443 ssl http2; + server_name ; index index.html index.php index.htm; ssl_certificate /nginx/ssl/certificates/.crt; diff --git a/reverse-nginx/rootfs/nginx/www/letsencrypt b/reverse-proxy/rootfs/nginx/www/letsencrypt similarity index 100% rename from reverse-nginx/rootfs/nginx/www/letsencrypt rename to reverse-proxy/rootfs/nginx/www/letsencrypt diff --git a/reverse-nginx/rootfs/usr/local/bin/check_certs b/reverse-proxy/rootfs/usr/local/bin/check_certs similarity index 100% rename from reverse-nginx/rootfs/usr/local/bin/check_certs rename to reverse-proxy/rootfs/usr/local/bin/check_certs diff --git a/reverse-nginx/rootfs/usr/local/bin/startup b/reverse-proxy/rootfs/usr/local/bin/startup similarity index 85% rename from reverse-nginx/rootfs/usr/local/bin/startup rename to reverse-proxy/rootfs/usr/local/bin/startup index 3fa819e..a444b7c 100644 --- a/reverse-nginx/rootfs/usr/local/bin/startup +++ b/reverse-proxy/rootfs/usr/local/bin/startup @@ -37,15 +37,20 @@ f_gen_sites_enabled() { fi if [ "${FRONTEND_TOR}" == "true" ]; then if [ -d /tor/${FRONTEND_DOMAIN}/ ]; then - sed -e 's||'${FRONTEND_DOMAIN} $(`cat /tor/${FRONTEND_DOMAIN}/hostname`)'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf + ONION_DOMAIN=$(cat /tor/${FRONTEND_DOMAIN}/hostname) + echo "HiddenServiceDir /tor/"${FRONTEND_DOMAIN}"/" >> /etc/tor/torrc + echo "HiddenServicePort 443 127.0.0.1:443" >> /etc/tor/torrc + sed -e 's||'${FRONTEND_DOMAIN}'|' \ + -e 's||'${ONION_DOMAIN}'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf else - echo "HiddenServiceDir /var/lib/tor/"${FRONTEND_DOMAIN}"/" >> /usr/local/etc/tor/torrc - echo "HiddenServicePort 443 127.0.0.1:443" >> /usr/local/etc/tor/torrc - sed -e 's||'${FRONTEND_DOMAIN} $(`cat /tor/${FRONTEND_DOMAIN}/hostname`)'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf - fi - + echo "HiddenServiceDir /tor/"${FRONTEND_DOMAIN}"/" >> /etc/tor/torrc + echo "HiddenServicePort 443 127.0.0.1:443" >> /etc/tor/torrc + echo "Please restard your container" + sed -e 's||'${FRONTEND_DOMAIN}'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf + fi else - sed -e 's||'${FRONTEND_DOMAIN}'|' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf + sed -e 's||'${FRONTEND_DOMAIN}'|' \ + -e 's|| |' ${template_sites} > /nginx/sites-enabled/${FRONTEND_DOMAIN}.conf fi } @@ -171,8 +176,7 @@ f_log INF "Create user 'reverse'" addgroup -g ${GID} reverse && adduser -H -s /bin/sh -D -G reverse -u ${UID} reverse f_log INF "Create folder" mkdir -p /nginx/sites-enabled /nginx /nginx/log /nginx/run /nginx/sites-enabled /nginx/ssl /nginx/ssl/selfsigned/dhparam - - +mkdir -p /home/reverse/.tor # Generate file for container in $(curl --unix-socket /var/run/docker.sock http://localhost/containers/json 2> /dev/null | jq '.[].Names' | sed 's|.*"/\(.*\)"$|\1|;/\[/d;/\]/d'); do CONTAINER_LABELS=$(curl --unix-socket /var/run/docker.sock http://localhost/containers/${container}/json 2> /dev/null | jq '.Config.Labels' | grep -E "reverse\." | sed 's|.*"\(.*\)": "\(.*\)".*$|\1 \2|') @@ -180,7 +184,7 @@ for container in $(curl --unix-socket /var/run/docker.sock http://localhost/cont done f_log INF "Apply permissions" -chown -R reverse:reverse /nginx /etc/s6.d +chown -R reverse:reverse /nginx /etc/s6.d /tor/ /home/reverse/.tor chmod +x /usr/local/bin/check_certs find /etc/s6.d -name run -exec chmod +x {} \; find /etc/s6.d -name finish -exec chmod +x {} \; @@ -190,8 +194,8 @@ f_log SUC "End reverse configuration" ## run s6 if [ $# -gt 0 ]; then - exec su-exec reverse:reverse "$@" + exec su-exec reverse:reverse "$@" else - exec su-exec reverse:reverse /bin/s6-svscan /etc/s6.d - exec su-exec tor:tor /bin/s6-svscan /etc/s6-tor.d + exec su-exec reverse:reverse /bin/s6-svscan /etc/s6.d fi +