diff --git a/process/cron/backup-eressea b/process/backup-eressea similarity index 100% rename from process/cron/backup-eressea rename to process/backup-eressea diff --git a/process/cron/create-orders b/process/create-orders similarity index 100% rename from process/cron/create-orders rename to process/create-orders diff --git a/process/cron/crontab b/process/cron/crontab new file mode 100644 index 000000000..bcdc326c9 --- /dev/null +++ b/process/cron/crontab @@ -0,0 +1,18 @@ +# Crontab for Eressea on gruenbaer.kn-bremen.de + +PATH=$HOME/bin:/opt/bin:/usr/local/bin:/usr/bin:/bin +ERESSEA=/home/eressea/eressea +ATLANTIS=/home/eressea/atlantis +ENABLED=no +PREVIEW=no +CONFIRM=yes + +# m h dom mon dow command +00 00 * * * $HOME/bin/fetchmail.cron +00 22 * * * $HOME/bin/backup-db.sh + +15 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 3 +25 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 4 +35 21 * * Sat [ "$ENABLED" = "yes" ] || $ERESSEA/server/bin/run-eressea.cron 2 +39 08 * * Sun [ "$PREVIEW" = "yes" ] || $ERESSEA/server/bin/previews.cron +*/5 * * * * [ "$CONFIRM" = "yes" ] || $ERESSEA/server/bin/orders.cron 2 3 4 diff --git a/process/cron/orders.cron b/process/cron/orders.cron new file mode 100755 index 000000000..be573fe86 --- /dev/null +++ b/process/cron/orders.cron @@ -0,0 +1,16 @@ +#!/bin/bash + +## this script processes incoming order files. +# files are delivered into an incoming queue by procmail, then cron runs +# this here script to make a non-blocking syntax check and reject or +# accept the order file. + +for GAME in $* +do + if [ "$GAME" == "eressea" ]; then GAME=2 ; fi + if [ "$GAME" == "e3a" ]; then GAME=3 ; fi + if [ -e $HOME/eressea/game-$GAME/orders.queue ] + then + $HOME/bin/orders-process $GAME + fi +done diff --git a/s/cron/previews.sh b/process/cron/preview.cron similarity index 53% rename from s/cron/previews.sh rename to process/cron/preview.cron index b18038843..56bdeb940 100755 --- a/s/cron/previews.sh +++ b/process/cron/preview.cron @@ -5,10 +5,10 @@ branch="develop" if [ -e ${ERESSEA}/build/.preview ]; then branch=`cat ${ERESSEA}/build/.preview` fi -SRC=${ERESSEA}/git -${SRC}/s/preview build ${branch} || exit $? -${SRC}/s/preview version +BIN=${ERESSEA}/server/s +${BIN}/preview build ${branch} || exit $? +${BIN}/preview version for game in 2 3 4 ; do - ${SRC}/s/preview -g ${game} run && \ - ${SRC}/s/preview -g ${game} send + ${BIN}/preview -g ${game} run && \ + ${BIN}/preview -g ${game} send done diff --git a/process/cron/run-eressea b/process/cron/run-eressea.cron similarity index 93% rename from process/cron/run-eressea rename to process/cron/run-eressea.cron index e932378fc..becf5b860 100755 --- a/process/cron/run-eressea +++ b/process/cron/run-eressea.cron @@ -39,7 +39,7 @@ if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then fi echo "sending reports for game $GAME, turn $TURN" $BIN/compress.sh $GAME $TURN -$BIN/sendreports.sh $GAME +# $BIN/sendreports.sh $GAME +# [ $GAME -lt 4 ] && $BIN/send-summary $GAME $BIN/backup-eressea $GAME $TURN -[ $GAME -lt 4 ] && $BIN/send-summary $GAME rm -f test/execute.lock diff --git a/process/cron/run-turn b/process/run-turn similarity index 100% rename from process/cron/run-turn rename to process/run-turn diff --git a/s/install b/s/install index 08d171849..39c91174a 100755 --- a/s/install +++ b/s/install @@ -8,6 +8,8 @@ while [ ! -d $ROOT/.git ]; do fi done +DEST=$(dirname $ROOT)/server + MACHINE=`uname -m` [ -z "$CC" ] && [ ! -z `which gcc` ] && CC="gcc" [ -z "$CC" ] && [ ! -z `which tcc` ] && CC="tcc" @@ -17,3 +19,10 @@ BIN_DIR="build-$MACHINE-$CC-Debug" cd $ROOT/$BIN_DIR make install +[ -d $DEST/bin ] || mkdir -p $DEST/bin +install -v $ROOT/process/cron/*.cron $DEST/bin/ +programs="create-orders backup-eressea run-turn" +for prg in ${programs} ; do +install -v $ROOT/process/$prg $DEST/bin/ +done +crontab $ROOT/process/cron/crontab diff --git a/src/buildno.h b/src/buildno.h index a213d5520..f26ec2251 100644 --- a/src/buildno.h +++ b/src/buildno.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 4 -#define VERSION_BUILD 2 +#define VERSION_BUILD 3