diff --git a/dbp/banunban.sh b/dbp/banunban.sh index 8f8390a..192ce5b 100755 --- a/dbp/banunban.sh +++ b/dbp/banunban.sh @@ -27,7 +27,7 @@ fi MYSTIC_DIR="@MYSTIC_DIR@" TMP_DIR=$(mktemp -d) -BAN_UNBAN_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S GeneralDbP -k BanUnbanIP --silent` +BAN_UNBAN_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S General -k BanUnbanIP --silent` BAN_UNBAN_SERVICE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S BanUnbanIP -k BanningService --silent` BAN_UNBAN_MYSTIC=`${MYSTIC_DIR}/inimod r ${INIFILE} -S BanUnbanIP -k UnbanInMystic --silent` diff --git a/dbp/cron.sh b/dbp/cron.sh index 01ba908..a5cd06d 100755 --- a/dbp/cron.sh +++ b/dbp/cron.sh @@ -21,30 +21,30 @@ fi MYSTIC_DIR="@MYSTIC_DIR@" TMP_DIR=$(mktemp -d) -MIS_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S GeneralDbP -k MisLog --silent` +MIS_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S General -k MisLog --silent` MIS_KEEP=`${MYSTIC_DIR}/inimod r ${INIFILE} -S MisLog -k RetentionTime --silent` -POLL_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S GeneralDbP -k PollLog --silent` +POLL_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S General -k PollLog --silent` POLL_KEEP=`${MYSTIC_DIR}/inimod r ${INIFILE} -S PollLog -k RetentionTime --silent` -MUTIL_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S GeneralDbP -k MutilLog --silent` +MUTIL_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S General -k MutilLog --silent` MUTIL_KEEP=`${MYSTIC_DIR}/inimod r ${INIFILE} -S MutilLog -k RetentionTime --silent` -ERROR_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S GeneralDbP -k ErrorLog --silent` +ERROR_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S General -k ErrorLog --silent` ERROR_KEEP=`${MYSTIC_DIR}/inimod r ${INIFILE} -S ErrorLog -k RetentionTime --silent` -MRCCHAT_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S GeneralDbP -k MrcChatLog --silent` +MRCCHAT_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S General -k MrcChatLog --silent` MRCCHAT_KEEP=`${MYSTIC_DIR}/inimod r ${INIFILE} -S MrcChatLog -k RetentionTime --silent` -MRCSERVER_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S GeneralDbP -k MrcServerLog --silent` +MRCSERVER_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S General -k MrcServerLog --silent` MRCSERVER_KEEP=`${MYSTIC_DIR}/inimod r ${INIFILE} -S MrcServerLog -k RetentionTime --silent` -NODE_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S GeneralDbP -k NodeLog --silent` +NODE_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S General -k NodeLog --silent` NODE_COUNT=`${MYSTIC_DIR}/inimod r ${INIFILE} -S NodeLog -k MaxNodes --silent` NODE_KEEP=`${MYSTIC_DIR}/inimod r ${INIFILE} -S NodeLog -k RetentionTime --silent` -NODE_START=1 +NODE_START=0 -IP2L_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S GeneralDbP -k Ip2Location --silent` +IP2L_ENABLE=`${MYSTIC_DIR}/inimod r ${INIFILE} -S General -k Ip2Location --silent` IP2L_TOKEN=`${MYSTIC_DIR}/inimod r ${INIFILE} -S Ip2Location -k Token --silent` IP2L_DB=`${MYSTIC_DIR}/inimod r ${INIFILE} -S Ip2Location -k Database --silent` diff --git a/dbp/dbp.ini b/dbp/dbp.ini index e69f344..965030b 100644 --- a/dbp/dbp.ini +++ b/dbp/dbp.ini @@ -1,4 +1,4 @@ -[GeneralDbP] +[General] Ip2Location=false MisLog=false diff --git a/mystic/install-v3.sh b/mystic/install-v3.sh index eb69dc0..515cc6d 100644 --- a/mystic/install-v3.sh +++ b/mystic/install-v3.sh @@ -34,7 +34,7 @@ if [ -z "${GROUP}" ]; then groupadd mystic &>/dev/null fi if [ -z "${USER}" ]; then -useradd --home-dir ${MYSTIC_DIR} -g mystic mystic &>/dev/null +useradd -m --home-dir ${MYSTIC_DIR} -g mystic mystic &>/dev/null fi chown mystic:mystic -R ${MYSTIC_DIR} &>/dev/null find ${MYSTIC_DIR} -name '*.txt' -type f -exec dos2unix {} \; &>/dev/null diff --git a/mystic/maint-v3.sh b/mystic/maint-v3.sh index 08d1c26..7539563 100644 --- a/mystic/maint-v3.sh +++ b/mystic/maint-v3.sh @@ -1,7 +1,7 @@ pushd ${MUTIL_DIR} &>/dev/null configfile="maint.ini" -config=('PurgeMessageBases' 'PackMessageBases' 'MergeNodeLists' 'PackFileBases' 'PurgeUserBase' 'PackUserBase' 'FileSort') +config=('PurgeMessageBases' 'PackMessageBases' 'MergeNodeLists' 'PackFileBases' 'LinkMessages' 'PurgeUserBase' 'PackUserBase' 'FileSort') msg_info "Merging ${config} into ${configfile}" preparray=("${configarray[@]}") for el in ${config[@]}