diff --git a/Dockerfile b/Dockerfile index 167ea8b..edb074b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,15 +16,14 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Add in Leenooks' apt repository -RUN curl -sL http://apt.leenooks.net/stretch/setup.sh | sh -RUN curl -sL http://apt.leenooks.net/buster/setup.sh | sh +RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=buster bash # Add ZeroTier RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/stretch stretch main" > /etc/apt/sources.list.d/zerotier.list # Leenooks Utils RUN apt-get update \ - && apt-get install -y binkd=1.1a-109 makenl goldedplus qico zerotier-one \ + && apt-get install -y binkd=1.1a-111 makenl goldedplus qico zerotier-one \ && mv /etc/binkd /etc/binkd.orig \ && mv /etc/qico /etc/qico.orig \ && apt-get -y autoremove \ @@ -99,7 +98,7 @@ IHMvLipcXFxcLi8vYC87IGRvbmUKIGVuZGlmCiAKIHVuaW5zdGFsbDoK '|base64 -d|git apply \ # && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* COPY nginx/binkps.conf /etc/nginx/modules-enabled/ -COPY nginx/binkps.* /etc/nginx/conf.d/ssl/ +COPY nginx/binkps.crt nginx/binkps.key /etc/nginx/conf.d/ssl/ COPY xinetd.d /etc/xinetd.d/ COPY logrotate.d /etc/logrotate.d/ COPY supervisord.d /etc/supervisor/conf.d/ diff --git a/nginx/binkps.conf b/nginx/binkps.conf index db7274e..870ab57 100644 --- a/nginx/binkps.conf +++ b/nginx/binkps.conf @@ -4,6 +4,7 @@ stream { listen 24553 ssl; ssl_certificate /etc/nginx/conf.d/ssl/binkps.crt; ssl_certificate_key /etc/nginx/conf.d/ssl/binkps.key; + ssl_protocols TLSv1.2 TLSv1.3; proxy_pass 127.0.0.1:24554; } }