bbs/fidohub
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update binkd to 111, enable TLS1.3 in nginx, updated build of husky

Browse Source
This commit is contained in:
Deon George 2020-10-29 12:20:47 +11:00
parent d79f64ca93
commit 9ae8a6fd9d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -16,15 +16,14 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Add in Leenooks' apt repository # Add in Leenooks' apt repository
RUN curl -sL http://apt.leenooks.net/stretch/setup.sh | sh RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=buster bash
RUN curl -sL http://apt.leenooks.net/buster/setup.sh | sh
# Add ZeroTier # Add ZeroTier
RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/stretch stretch main" > /etc/apt/sources.list.d/zerotier.list RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/stretch stretch main" > /etc/apt/sources.list.d/zerotier.list
# Leenooks Utils # Leenooks Utils
RUN apt-get update \ 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/binkd /etc/binkd.orig \
&& mv /etc/qico /etc/qico.orig \ && mv /etc/qico /etc/qico.orig \
&& apt-get -y autoremove \ && apt-get -y autoremove \
@ -99,7 +98,7 @@ IHMvLipcXFxcLi8vYC87IGRvbmUKIGVuZGlmCiAKIHVuaW5zdGFsbDoK '|base64 -d|git apply \
# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
COPY nginx/binkps.conf /etc/nginx/modules-enabled/ 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 xinetd.d /etc/xinetd.d/
COPY logrotate.d /etc/logrotate.d/ COPY logrotate.d /etc/logrotate.d/
COPY supervisord.d /etc/supervisor/conf.d/ COPY supervisord.d /etc/supervisor/conf.d/

1
nginx/binkps.conf
View File

@ -4,6 +4,7 @@ stream {
listen 24553 ssl; listen 24553 ssl;
ssl_certificate /etc/nginx/conf.d/ssl/binkps.crt; ssl_certificate /etc/nginx/conf.d/ssl/binkps.crt;
ssl_certificate_key /etc/nginx/conf.d/ssl/binkps.key; ssl_certificate_key /etc/nginx/conf.d/ssl/binkps.key;
ssl_protocols TLSv1.2 TLSv1.3;
proxy_pass 127.0.0.1:24554; proxy_pass 127.0.0.1:24554;
} }
} }