diff -urN smeserver-xt_geoip-1.3.1.old/createlinks smeserver-xt_geoip-1.3.1/createlinks --- smeserver-xt_geoip-1.3.1.old/createlinks 2022-03-09 22:16:38.099000000 +0400 +++ smeserver-xt_geoip-1.3.1/createlinks 2022-06-28 22:21:29.958000000 +0400 @@ -45,3 +45,13 @@ event_link('navigation2-conf', "$event", '80'); event_link('routes2-conf', "$event", '80'); event_link('locales2-conf', "$event", '80'); + +use esmith::Build::Backup qw(:all); +backup_includes("smeserver-xt_geoip", qw( +/usr/share/xt_geoip/BE/ +/usr/share/xt_geoip/LE/ +/var/lib/xt_geoip/ +)); +backup_excludes("smeserver-xt_geoip", qw( +/var/lib/xt_geoip/README.txt +)); diff -urN smeserver-xt_geoip-1.3.1.old/root/usr/share/xt_geoip/geoip_stats smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_stats --- smeserver-xt_geoip-1.3.1.old/root/usr/share/xt_geoip/geoip_stats 2022-03-09 22:16:38.066000000 +0400 +++ smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_stats 2022-07-02 17:36:21.880000000 +0400 @@ -34,12 +34,15 @@ # permanent files BASEFILE="$STATDIR/Base_${PREF}_ip.lst" BASE2FILE="$STATDIR/Base_${PREF}_country.lst" +ARCHFILE="$STATDIR/ArchBase_${PREF}_ip.lst" +ARCH2FILE="$STATDIR/ArchBase_${PREF}_country.lst" # tempo TMPFILE=$(mktemp $STATDIR/xt_${PREF}.XXXXXXX) # Day - 1 MONTH=$(date --date '1 day ago' +%B) LOGDAY="${MONTH:0:3} $(date --date '1 day ago' +%d)" DATE=$(date --date '1 day ago' '+%Y-%m-%d') +ARCHDATE=$(date --date '90 day ago' '+%Y-%m-%d') cd $EXECDIR @@ -80,8 +83,30 @@ cat $RESFILE >> $BASEFILE cat $RES2FILE >> $BASE2FILE -# delete files of today -#rm -f $RESFILE $RES2FILE +touch ${TMPFILE}_last3m +touch ${TMPFILE}_older + +# split IP bases file between 'last 3 months' and 'archives' +awk -F ';' "\$1 > \"$ARCHDATE\" {print > (\"${TMPFILE}_last3m\"); next} {print > (\"${TMPFILE}_older\")}" $BASEFILE + +if [ -f ${TMPFILE}_older ] +then + cat ${TMPFILE}_older >> $ARCHFILE + cp ${TMPFILE}_last3m $BASEFILE +fi +cp /dev/null ${TMPFILE}_last3m +cp /dev/null ${TMPFILE}_older + +# split COUNTRY bases file between 'last 3 months' and archives + awk -F ';' "\$1 > \"$ARCHDATE\" {print > (\"${TMPFILE}_last3m\"); next} {print > (\"${TMPFILE}_older\")}" $BASE2FILE + +if [ -f ${TMPFILE}_older ] +then + cat ${TMPFILE}_older >> $ARCH2FILE + cp ${TMPFILE}_last3m $BASE2FILE +fi + +rm -f ${TMPFILE}_last3m ${TMPFILE}_older # for mail if [ -s $RES2FILE ] @@ -89,3 +114,7 @@ echo "parse $LOGDIR for $PREF events" cat $RES2FILE fi + +# delete files of today +#rm -f $RESFILE $RES2FILE +