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

Update tags patch, remove nncp

Browse Source
This commit is contained in:
Deon George 2023-04-11 22:18:20 +10:00
parent f321af3062
commit 7a32a52517
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Feature-main-sbbs-404-Reserve-space-up-to-tagsBuffer.patch
View File

@ -13,7 +13,7 @@ index 53b886392..29624a79a 100644
--- a/src/smblib/smblib.c --- a/src/smblib/smblib.c
+++ b/src/smblib/smblib.c +++ b/src/smblib/smblib.c
@@ -1603,6 +1603,7 @@ int smb_addmsghdr(smb_t* smb, smbmsg_t* msg, int storage) @@ -1603,6 +1603,7 @@ int smb_addmsghdr(smb_t* smb, smbmsg_t* msg, int storage)
ulong hdrlen; uint hdrlen;
off_t idxlen; off_t idxlen;
size_t idxreclen = smb_idxreclen(smb); size_t idxreclen = smb_idxreclen(smb);
+ int tagsBuffer = 4; /* @todo this should be determined from a system configuration item */ + int tagsBuffer = 4; /* @todo this should be determined from a system configuration item */

24
Dockerfile
View File

@ -14,17 +14,17 @@ RUN apt-get -o Acquire::ForceIPv4=true update \
RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
# Add NNCP # Add NNCP
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list #RUN echo "deb http://deb.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list
#
RUN apt-get -o Acquire::ForceIPv4=true update \ #RUN apt-get -o Acquire::ForceIPv4=true update \
&& apt-get install -yyq nncp less ssmtp \ # && apt-get install -yyq nncp less ssmtp \
&& mkdir /etc/nncp \ # && mkdir /etc/nncp \
&& apt-get -y autoremove \ # && apt-get -y autoremove \
&& apt-get clean \ # && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/nncp # && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/nncp
# Add in Leenooks' apt repository # Add in Leenooks' apt repository
RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash #RUN curl -sL http://apt.leenooks.net/setup.sh | DISTRO=bullseye bash
# Add ZeroTier # Add ZeroTier
#RUN echo "deb [trusted=yes] http://download.zerotier.com/debian/bullseye bullseye 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
@ -77,14 +77,14 @@ WORKDIR /opt/sbbs
ENV SBBSCTRL=/opt/sbbs/ctrl ENV SBBSCTRL=/opt/sbbs/ctrl
ENV SBBSEXEC=/opt/sbbs/exec ENV SBBSEXEC=/opt/sbbs/exec
ENV PATH=$PATH:${SBBSEXEC} ENV PATH=$PATH:${SBBSEXEC}
ENV NNCPCFG /etc/nncp/nncp.conf #ENV NNCPCFG /etc/nncp/nncp.conf
COPY start.sh ${SBBSEXEC}/ COPY start.sh ${SBBSEXEC}/
COPY doorparty.js ${SBBSEXEC}/ COPY doorparty.js ${SBBSEXEC}/
COPY main.cnf /opt/sbbs/ctrl.orig/ COPY main.cnf /opt/sbbs/ctrl.orig/
VOLUME [ "/var/lib/zerotier-one","/var/spool/nncp" ] #VOLUME [ "/var/lib/zerotier-one","/var/spool/nncp","/etc/nncp" ]
VOLUME [ "/opt/sbbs/data","/opt/sbbs/ctrl","/opt/sbbs/fido","/opt/sbbs/mods","/opt/sbbs/text","/etc/nncp" ] VOLUME [ "/opt/sbbs/data","/opt/sbbs/ctrl","/opt/sbbs/fido","/opt/sbbs/mods","/opt/sbbs/text" ]
COPY logrotate.d /etc/logrotate.d/ COPY logrotate.d /etc/logrotate.d/
RUN chmod 644 /etc/logrotate.d/* RUN chmod 644 /etc/logrotate.d/*

5
supervisord.d/nncp.conf
View File

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