From 8453f48ae4e44a8bf8681020b9409db83d31e627 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Mon, 23 Nov 2020 10:35:17 +1100
Subject: [PATCH] Updated to new main.cnf where nodes are in nodes/

---
 Dockerfile |   8 ++------
 main.cnf   | Bin 0 -> 6633 bytes
 2 files changed, 2 insertions(+), 6 deletions(-)
 create mode 100644 main.cnf

diff --git a/Dockerfile b/Dockerfile
index 32a9f81..d37e8ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,11 +44,6 @@ RUN apt-get update \
     && mv /opt/sbbs/ctrl /opt/sbbs/ctrl.orig \
     && mv /opt/sbbs/text /opt/sbbs/text.orig \
     && mkdir /opt/sbbs/nodes.orig && mv /opt/sbbs/node[1-5] /opt/sbbs/nodes.orig \
-    && ln -sf nodes/node1 /opt/sbbs/ \
-    && ln -sf nodes/node2 /opt/sbbs/ \
-    && ln -sf nodes/node3 /opt/sbbs/ \
-    && ln -sf nodes/node4 /opt/sbbs/ \
-    && ln -sf nodes/node5 /opt/sbbs/ \
     && find /opt/sbbs -name CVS -type d -exec rm -rf {} + \
     && SUDO_FORCE_REMOVE=yes apt-get -y purge git build-essential libnspr4-dev libncurses5-dev libncursesw5-dev cvs wget pkgconf libcap2-bin sudo \
     && apt-get -y autoremove \
@@ -69,9 +64,10 @@ ENV SBBSEXEC=/opt/sbbs/exec
 ENV PATH=$PATH:${SBBSEXEC}
 
 COPY start.sh ${SBBSEXEC}/
+COPY main.cnf ${SBBSCTRL}/
 
 VOLUME [ "/var/lib/zerotier-one" ]
-VOLUME [ "/opt/sbbs/data","/opt/sbbs/ctrl","/opt/sbbs/nodes","/opt/sbbs/fido","/opt/sbbs/text" ]
+VOLUME [ "/opt/sbbs/data","/opt/sbbs/ctrl","/opt/sbbs/fido","/opt/sbbs/text" ]
 
 COPY logrotate.d /etc/logrotate.d/
 RUN chmod 644 /etc/logrotate.d/*
diff --git a/main.cnf b/main.cnf
new file mode 100644
index 0000000000000000000000000000000000000000..91555e126d8b0aa962bb3b2cbaf22a3b52682b3b
GIT binary patch
literal 6633
zcmd_vPiP}m7y$4uNz>h~-TqCt+iw57w(h1v|7hI99u`g7q}xi;t(|J!vSP+$Xhzbc
zCeweQl7o0s=*g4fTs(>BK~D<iA_$7?!IOyO;7LIW?m<>Wzi&2{&Fj1`ZG#~AO=-S)
zzxUp}y!SE_+QgoinbDwrByLsfCHBOuY3)r2&C)G{X*lvgfVNl6Z!(n+X(eNb8(W2~
z!va;J-O`pK+A)US1XEMDbNRGUbbdc}Th*hoyrzAq!S;_g*#7Ei+E1r-OP^N0!8$NC
zHErw~sZ+PF)BV5BPiFJ$`CQg4T4HkJR9Bn-y|eiqc;L5$7u&bN&?hJ8rny>IoS@C|
zs)p3nY=`EwSaf0K=CX6rVFIjqC~b1i*<a3-)zrutJ6lDg0DxrXYRLTrx6MXAT|D)+
z!S)Sp+l}J7v*sJRnH7_p1!LPZcHD>hpDeA8|I}l%j9u%6qLBi9%gSSC0J~Np=akg%
zlWv$ad-ZF&*Z8NsnAB62xy?N&Tszn-nA`Y#afa<$p-$o9N4`!y72|fH*#g+i7cD3I
z>wgn|@WVOP#JHEAuzJ9~7ggzy3f#-b-HTPF%w5#2$#u6vb=jPn++@kEP+hjBCSKfE
zz=O{?d_v&!A#gvFI`IM>aF*Q3B=-Rw&`R!Pk~d-3*m(!JlSxiH&rgUyP9}LX&;b`!
zeg^1(0hOP{q2u6%%3FXAcv$5D{9NEx#|<`gKa<86fQRsa3AMM<<UFeO^Kc&Es@mJ|
z+Xq}zdpooP;1*SluY)EZH<`*ip%cJXdlz&8e5Lko=mt1Y`E|T5E^fwyQy8F33i2L+
zeexd4q#(b5>*qtiK$#Tey#OCKq4!cI1vze>a5MTv%A_Fg1GsYry^k^}$om13E$ID}
zNkM)I-~T!EOO#1Lj+?X8iatP@6y$^W`DjBQq)dukTw1&t+U*d+*Q2*Z@?qRxo#?}q
zNkJ|E%3bJ!GAYPMaDN2QM<|nmd=#M4gFZ@`6y#(0%<M%Uqf82N{BYsShVYfL+91D-
z>)(%lnKCKJui*L*pkJX(3i2SX{~&shGARyV7iSj2!;r>T%%rIL_!#dULEbA<yqBKf
zT`clmexCQ_2Ji4H@AjJtuXqk{W+D6z-U33DNm2F62fUX)<6V5sd-;3blRxtg_jtEk
zJnZ`m_wimCSNL<@j0b0}bj>q?uSe&v>SCVv@+$Aib>3lzcl!<A!*BCmd7t;vr@V_V
z6@JHCq4_I+=h=6izp5vH;vMetZu`7!|KV=lE2F%ZLcEI^-pfz(p41h->8p6~;SVo+
zg>Q+z21rqLyTp5VpZCgpyq7-WU3|fN`CHzTKk^R0@^1gBaNBSD?|LBon*Vj*8XW!d
zUG>UayqDhPU3|!U`E%Zr-|!AU@NWOYd-xB=+k@~*e{*|~4rzPgcW-Skm&z3KIl~g;
zvst}ZG*gerwVd;4Y%cOle8ts{U-;nV7W3O?%5c9LXbXv@cnmv^ENTnK?_a99y1MYJ
zn9btblR!SDigMY>&zELr@_Hd%|B6`gW@I^f@+;J|ST(chly23(-0DI+IvZ(p?GpM+
z`2zmeq3-n(k*BJE;;b3&2~U=doUyK_jk=dxjxEM+M544=8i=T|l`?`w5jWQ}){A;U
UXc;4$b?GoZqs_<S@dkJ1-)BjgkN^Mx

literal 0
HcmV?d00001