Added ticproc and inotify

This commit is contained in:
Deon George 2018-11-09 15:21:29 +11:00
parent b5e73b4544
commit 3ae2eef0c8
5 changed files with 22 additions and 5 deletions

View File

@ -18,14 +18,15 @@ RUN ln -sf /usr/share/zoneinfo/Australia/Melbourne /etc/localtime
RUN curl -s http://apt.leenooks.net/setup.sh | sh RUN curl -s http://apt.leenooks.net/setup.sh | sh
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --allow-unauthenticated magicka openssh-server binkd supervisor \ && apt-get install -y --allow-unauthenticated magicka openssh-server binkd supervisor inotify-tools \
&& apt-get -y autoremove \ && apt-get -y autoremove \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* #3 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* #3
ADD binkd.conf /opt/magicka/etc/ ADD binkd.conf /opt/magicka/etc/
ADD magimail.prefs /opt/magicka/etc/ ADD magimail.prefs /opt/magicka/etc/
ADD magitoss.sh /opt/magicka/bin ADD ticproc.ini /opt/magicka/etc/magicka/
ADD *.sh /opt/magicka/bin/
RUN ln -sf magitoss.sh /opt/magicka/bin/magiscan.sh RUN ln -sf magitoss.sh /opt/magicka/bin/magiscan.sh
WORKDIR /opt/magicka WORKDIR /opt/magicka

View File

@ -1,5 +1,5 @@
# Number @ end is the root zone # Number @ end is the root zone
domain private /opt/magicka/data/ftn/private 10 domain private /opt/magicka/data/ftn/out 10
#domain fsxnet /opt/magicka/data/ftn/fsxnet 21 #domain fsxnet /opt/magicka/data/ftn/fsxnet 21
# Our Private address # Our Private address

8
init
View File

@ -17,12 +17,12 @@ if [ ! -d "${MAGICKA_ROOT}/data/etc" ]; then
sed -i 's#magicka#opt/magicka/data#g' ${MAGICKA_ROOT}/data/etc/magicka/filesgen.ini sed -i 's#magicka#opt/magicka/data#g' ${MAGICKA_ROOT}/data/etc/magicka/filesgen.ini
sed -i 's#var/magicka/msgs#data/msgs#g' ${MAGICKA_ROOT}/data/etc/magicka/localmail.ini sed -i 's#var/magicka/msgs#data/msgs#g' ${MAGICKA_ROOT}/data/etc/magicka/localmail.ini
mkdir ${MAGICKA_ROOT}/data/{msgs,ftn} mkdir ${MAGICKA_ROOT}/data/{msgs,ftn}
mkdir ${MAGICKA_ROOT}/data/ftn/{cm_temp,cm_packets,in_sec,in,in_temp} mkdir ${MAGICKA_ROOT}/data/ftn/{bad_tic,cm_temp,cm_packets,in_sec,in,in_temp,out}
rmdir ${MAGICKA_ROOT}/data/var/magicka/msgs rmdir ${MAGICKA_ROOT}/data/var/magicka/msgs
fi fi
# Fix for magiedit # Fix for magiedit
mkdir ${MAGICKA_ROOT}/data/share/magicka/ansis/drafts [ -d ${MAGICKA_ROOT}/data/share/magicka/ansis/drafts ] || mkdir ${MAGICKA_ROOT}/data/share/magicka/ansis/drafts
ln -sf ${MAGICKA_ROOT}/data/share/magicka/ansis/drafts ${MAGICKA_ROOT}/share/magicka/ansis/drafts ln -sf ${MAGICKA_ROOT}/data/share/magicka/ansis/drafts ${MAGICKA_ROOT}/share/magicka/ansis/drafts
ln -sf ${MAGICKA_ROOT}/data/share/magicka/ansis/magiedit.ans ${MAGICKA_ROOT}/share/magicka/ansis/magiedit.ans ln -sf ${MAGICKA_ROOT}/data/share/magicka/ansis/magiedit.ans ${MAGICKA_ROOT}/share/magicka/ansis/magiedit.ans
ln -sf ${MAGICKA_ROOT}/data/share/magicka/ansis/magiquote.ans ${MAGICKA_ROOT}/share/magicka/ansis/magiquote.ans ln -sf ${MAGICKA_ROOT}/data/share/magicka/ansis/magiquote.ans ${MAGICKA_ROOT}/share/magicka/ansis/magiquote.ans
@ -37,5 +37,9 @@ done
# clear out state and lockfiles from previous instance # clear out state and lockfiles from previous instance
echo "* Setting up FTN watch"
touch ${MAGICKA_ROOT}/data/var/magicka/mail.out
( while inotifywait -e close_write ${MAGICKA_ROOT}/data/var/magicka/mail.out; do ${MAGICKA_ROOT}/bin/magiscan.sh;done )&
echo "* Ready..." echo "* Ready..."
exec "$@" exec "$@"

10
ticproc.ini Normal file
View File

@ -0,0 +1,10 @@
[main]
Ignore Password = true
Ignore Case = false
Inbound Directory = /opt/magicka/data/ftn/in_sec
Bad Files Directory = /opt/magicka/data/ftn/tic_bad
#[SOME_AREA]
#Database = /opt/magicka/data/var/magicka/files_somearea.sq3
#File Path = /opt/magicka/data/files/somearea
#Password = SECRET

2
ticproc.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
/opt/magicka/bin/magi_ticproc /opt/magicka/data/etc/magicka/ticproc.ini