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

Updates for bullseye, update binkd 115, add nncp

Browse Source
This commit is contained in:
Deon George 2022-10-16 23:02:16 +11:00
parent 85c09a8510
commit 6fa5137fd1
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Dockerfile
View File

@ -1,7 +1,7 @@
# NAME leenooks/fidohub
# VERSION latest
FROM debian:buster-slim
FROM debian:bullseye-slim
# Set the default timezone for the container
RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
@ -15,15 +15,28 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# Add NNCP
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list
RUN apt-get update \
&& apt-get install -yyq nncp less ssmtp \
&& mkdir /etc/nncp \
&& apt-get -y autoremove \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/nncp
# Add in Leenooks' apt repository
RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash
# For qico
RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=buster bash
RUN echo "deb http://deb.debian.org/debian buster main" > /etc/apt/sources.list.d/buster-oldstable.list
# Add ZeroTier
RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list
RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/bullseye bullseye main" > /etc/apt/sources.list.d/zerotier.list
# Leenooks Utils
RUN apt-get update \
&& apt-get install -y binkd=1.1a-114 makenl goldedplus qico zerotier-one \
&& apt-get install -y binkd=1.1a-115 makenl goldedplus qico zerotier-one \
&& mv /etc/binkd /etc/binkd.orig \
&& mv /etc/qico /etc/qico.orig \
&& apt-get -y autoremove \
@ -58,17 +71,7 @@ RUN apt-get update \
&& sed -e 's#HTML=1#HTML=0#' -i huskymak.cfg \
&& sed -e 's#CODEPAGE=KOI8-R#CODEPAGE=CP437#' -i huskymak.cfg \
&& sed -e 's#USE_HPTZIP=0#USE_HPTZIP=1#' -i huskymak.cfg \
&& cd ../areastat && echo 'ZGlmZiAtLWdpdCBhL01ha2VmaWxlIGIvTWFrZWZpbGUKaW5kZXggYzA1NTBiNC4uYTQwMWIwZCAx\
MDA2NDQKLS0tIGEvTWFrZWZpbGUKKysrIGIvTWFrZWZpbGUKQEAgLTYwLDggKzYwLDggQEAgYWxs\
OiBhcmVhc3RhdCBtYW4KIGluc3RhbGw6IGFsbAogCSQoSU5TVEFMTCkgJChJQk9QVCkgYXJlYXN0\
YXQgJChCSU5ESVIpCiBpZmRlZiBNQU5ESVIKLQktJChNS0RJUikgJChNS0RJUk9QVCkgJChNQU5E\
SVIpJChESVJTRVApbWFuMQotCWZvciBtIGluICQoTUFOUyk7IGRvICQoSU5TVEFMTCkgJChJTU9Q\
VCkgJCRtLmd6ICQoTUFORElSKSQoRElSU0VQKW1hbmBlY2hvICQkbSB8IHNlZCBzLy4qXFwuLy9g\
LzsgZG9uZQorCS0kKE1LRElSKSAkKE1LRElST1BUKSAkKE1BTkRJUikkKERJUlNFUCltYW41CisJ\
Zm9yIG0gaW4gJChNQU5TKTsgZG8gJChJTlNUQUxMKSAkKElNT1BUKSAkJG0uZ3ogJChNQU5ESVIp\
JChESVJTRVApbWFuYGVjaG8gJCRtIHwgc2VkIHMvLipcXFxcLi8vYC87IGRvbmUKIGVuZGlmCiAK\
IHVuaW5zdGFsbDoK'|base64 -d|git apply && cd .. \
&& cd /tmp/husky\
&& cd /tmp/husky \
&& cp -f -p huskybse/Makefile Makefile \
&& cp -f -p huskybse/huskymak.cfg huskymak.cfg \
&& cp -f -p huskybse/script/build.sh build.sh \
@ -99,6 +102,7 @@ COPY nginx/binkps.crt nginx/binkps.key /etc/nginx/conf.d/ssl/
COPY xinetd.d /etc/xinetd.d/
#COPY --chmod=644 logrotate.d /etc/logrotate.d/
COPY logrotate.d /etc/logrotate.d/
RUN chmod 644 /etc/logrotate.d/*
COPY supervisord.d /etc/supervisor/conf.d/
COPY jamnntpd.orig/config /etc/jamnntpd.orig/
COPY ftn.orig /etc/ftn.orig/
@ -107,9 +111,11 @@ COPY golded /usr/local/bin
COPY goldkeys.cfg /etc
COPY tools/* /usr/local/bin/
EXPOSE 119 24553 24554 60177 60179
ENV NNCPCFG /etc/nncp/nncp.conf
EXPOSE 119 5400 24553 24554 60177 60179
VOLUME [ "/var/lib/zerotier-one" ]
VOLUME [ "/etc/binkd","/etc/ifmail","/etc/ftn","/etc/jamnntpd","/etc/qico","/fido" ]
VOLUME [ "/etc/binkd","/etc/ifmail","/etc/ftn","/etc/jamnntpd","/etc/qico","/etc/nncp","/fido" ]
VOLUME [ "/etc/cron.hourly","/etc/cron.daily","/etc/cron.weekly","/etc/cron.monthly" ]
VOLUME [ "/var/spool/nncp" ]
ENTRYPOINT [ "/sbin/init" ]
CMD [ "/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf","-n" ]

3
supervisord.d/nncp.conf Normal file
View File

@ -0,0 +1,3 @@
[program:nncp]
#environment=NNCPCFG="/etc/nncp/nncp.conf"
command=/usr/bin/nncp-daemon -autotoss