diff --git a/dbp/cron.sh b/dbp/cron.sh index c409614..01ba908 100755 --- a/dbp/cron.sh +++ b/dbp/cron.sh @@ -101,7 +101,7 @@ if [ $MRCSERVER_ENABLE = "true" ]; then ln -sf ../../logs/mrcserver.${NOW}.log ${MYSTIC_DIR}/data/mrc/mrcserver.log ln -sf mrcserver.${NOW}.log ${MYSTIC_DIR}/logs/mrcserver.log [ -f /${MYSTIC_DIR}/logs/mrcserver.${YESTERDAY}.log ] && gzip -9 ${MYSTIC_DIR}/logs/mrcserver.${YESTERDAY}.log - find ${MYSTIC_DIR}/logs/ -type f -mtime +${MRCserver_KEEP} -name 'mrcserver.*' -exec rm {} \; + find ${MYSTIC_DIR}/logs/ -type f -mtime +${MRCSERVER_KEEP} -name 'mrcserver.*' -exec rm {} \; fi if [ $NODE_ENABLE = "true" ]; then diff --git a/dbp/install-v1.sh b/dbp/install-v1.sh index 6927255..829ecbc 100644 --- a/dbp/install-v1.sh +++ b/dbp/install-v1.sh @@ -1,10 +1,24 @@ -#!/bin/bash - -MYSTIC_DIR="$1" +if [ $DBPSCRIPTS = "Yes" ]; then +msg_info "Installing bbs.disconnected-by-peer.at Scripts Dependencies for ${APP}" +wget -N https://ftp.disconnected-by-peer.at/IniMod/IniMod_linux_${INIMOD_ARCH}.zip -O $MSTEMPDIR/IniMod_linux_${INIMOD_ARCH}.zip &>/dev/null +rm -rf $MSTEMPDIR/IniMod_linux_${INIMOD_ARCH} &>/dev/null +mkdir -p $MSTEMPDIR/IniMod_linux_${INIMOD_ARCH} &>/dev/null +pushd $MSTEMPDIR/IniMod_linux_${INIMOD_ARCH} &>/dev/null +unzip ../IniMod_linux_${INIMOD_ARCH}.zip &>/dev/null +cp inimod ${MYSTIC_DIR} +chmod +x ${MYSTIC_DIR}/inimod +cp README.txt ${MYSTIC_DIR}/docs/inimod_README.txt +popd &>/dev/null +msg_ok "Installing bbs.disconnected-by-peer.at Scripts Dependencies for ${APP}" +msg_info "Installing DbP Cron/banip/unbanip Scripts" +pushd $MSTEMPDIR/mystic/dbp &>/dev/null sed -e "s!@MYSTIC_DIR@!${MYSTIC_DIR}!g" cron.sh > ${MYSTIC_DIR}/cron chmod +x ${MYSTIC_DIR}/cron sed -e "s!@MYSTIC_DIR@!${MYSTIC_DIR}!g" banunban.sh > ${MYSTIC_DIR}/banunban chmod +x ${MYSTIC_DIR}/banunban sed -e "s!@MYSTIC_DIR@!${MYSTIC_DIR}!g" dbp.ini > ${MYSTIC_DIR}/dbp.ini +popd &>/dev/null +msg_ok "Installing DbP Cron/banip/unbanip Scripts" +fi diff --git a/install-next.sh b/install-next.sh index aea016b..def4f0c 100644 --- a/install-next.sh +++ b/install-next.sh @@ -187,41 +187,13 @@ source $MSTEMPDIR/mystic/mrc-client/install-${SCRIPT_VER}.sh source $MSTEMPDIR/mystic/mrc-server/install-${SCRIPT_VER}.sh # Add Cryptlib support source $MSTEMPDIR/mystic/cryptlib/install-${SCRIPT_VER}.sh +# Add IP2Location +source $MSTEMPDIR/mystic/ip2location/install-${SCRIPT_VER}.sh +# Add DBP Scripts +source $MSTEMPDIR/mystic/dbp/install-${SCRIPT_VER}.sh exit 0 -#============================================================================================================== - -if [ $CRYPT = "Yes" ]; then -msg_info "Setting up ${APP} cryptlib for ssh/ssl (be patient compiling cryptlib)" -apt install -y build-essential &>/dev/null -apt install -y gcc-9 g++-9 cpp-9 gcc g++ cpp &>/dev/null -apt install -y patch &>/dev/null -apt install -y dos2unix &>/dev/null -wget -N http://www.mysticbbs.com/downloads/cl345.zip -O $MSTEMPDIR/cryptlib345.zip &>/dev/null -rm -rf $MSTEMPDIR/cryptlib-3.4.5 &>/dev/null -mkdir -p $MSTEMPDIR/cryptlib-3.4.5 &>/dev/null -pushd $MSTEMPDIR/cryptlib-3.4.5 &>/dev/null -unzip ../cryptlib345.zip &>/dev/null -dos2unix tools/* &>/dev/null -dos2unix kernel/* &>/dev/null -patch -p1 -i $MSTEMPDIR/mystic/cryptlib/gccversion-345.patch &>/dev/null -patch -p0 -i $MSTEMPDIR/mystic/cryptlib/cl-linux-yield.patch &>/dev/null -ln -sf gcc-9 /usr/bin/gcc &>/dev/null -ln -sf g++-9 /usr/bin/g++ &>/dev/null -ln -sf cpp-9 /usr/bin/cpp &>/dev/null -make shared &>/dev/null -apt purge -y gcc g++ cpp &>/dev/null -apt install -y gcc g++ cpp &>/dev/null -cp libcl.so.3.4.5 ${LIBDIR}/ &>/dev/null -ln -sf libcl.so.3.4.5 ${LIBDIR}/libcl.so.3.4 &>/dev/null -ln -sf libcl.so.3.4 ${LIBDIR}/libcl.so.3 &>/dev/null -ln -sf libcl.so.3 ${LIBDIR}/libcl.so &>/dev/null -popd &>/dev/null -msg_ok "Setting up ${APP} cryptlib for ssh/ssl (be patient compiling cryptlib)" -fi - -#============================================================================================================== if [ $IP2L = "Yes" ]; then msg_info "Setting up IP2Location Download Client for ${APP}" diff --git a/ip2location/install-v1.sh b/ip2location/install-v1.sh index e69de29..12912d1 100644 --- a/ip2location/install-v1.sh +++ b/ip2location/install-v1.sh @@ -0,0 +1,14 @@ +if [ $IP2L = "Yes" ]; then +msg_info "Setting up IP2Location Download Client for ${APP}" +apt install -y libwww-perl &>/dev/null +wget -N https://www.ip2location.com/downloads/ip2location-downloader-linux.zip -O $MSTEMPDIR/ip2location-downloader-linux.zip &>/dev/null +rm -rf $MSTEMPDIR/ip2location-downloader-linux &>/dev/null +mkdir -p $MSTEMPDIR/ip2location-downloader-linux &>/dev/null +pushd $MSTEMPDIR/ip2location-downloader-linux &>/dev/null +unzip ../ip2location-downloader-linux.zip &>/dev/null +cp download.pl ${MYSTIC_DIR}/ip2location +chmod +x ${MYSTIC_DIR}/ip2location +cp readme.txt ${MYSTIC_DIR}/docs/ip2location_README.txt +popd &>/dev/null +msg_ok "Setting up IP2Location Download Client for ${APP}" +fi diff --git a/mrc-server/mrc_server-start.sh b/mrc-server/mrc_server-start.sh index 3f14db1..688628e 100755 --- a/mrc-server/mrc_server-start.sh +++ b/mrc-server/mrc_server-start.sh @@ -27,7 +27,7 @@ fi # Starting the MRC python script cd $MRC_PATH >/dev/null -/usr/bin/python2 ./mrc_server.py $MRC_SERVER:$MRC_PORT > logs/mrcserver.log 2>&1 & +/usr/bin/python2 ./mrc_server.py $MRC_SERVER:$MRC_PORT > data/mrc/mrcserver.log 2>&1 & cd - >/dev/null # Wait 3 seconds and check for a PID