From ea4160a7099cde2e246edc02b514b08c16e0a4ec Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 19 May 2016 20:03:19 +0000 Subject: [PATCH] Applied production patches to trunk. - Legacy-Id: 11208 --- bin/daily | 18 ++++-- bin/hourly | 102 +++++++++++++++++--------------- ietf/secr/announcement/forms.py | 2 +- 3 files changed, 66 insertions(+), 56 deletions(-) diff --git a/bin/daily b/bin/daily index d596978bf..02ff589c7 100755 --- a/bin/daily +++ b/bin/daily @@ -6,25 +6,31 @@ # $DTDIR/etc/cron.d/datatracker which should be symlinked from # /etc/cron.d/ +# Run the hourly jobs first +$DTDIR/bin/hourly + +# Datatracker directory DTDIR=/a/www/ietf-datatracker/web cd $DTDIR/ +logger -p user.info -t cron "Running $DTDIR/bin/daily" + # Set up the virtual environment source $DTDIR/bin/activate -# Run the hourly jobs first -$DTDIR/bin/hourly - # Populate the yang repositories $DTDIR/ietf/manage.py populate_yang_model_dirs # Expire internet drafts -$DTDIR/ietf/bin/expire-ids +# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: +#$DTDIR/ietf/bin/expire-ids # Expire last calls -$DTDIR/ietf/bin/expire-last-calls +# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: +#$DTDIR/ietf/bin/expire-last-calls # Run an extended version of the rfc editor update, to catch changes # with backdated timestamps -$DTDIR/ietf/bin/rfc-editor-index-updates -d 1969-01-01 +# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: +#$DTDIR/ietf/bin/rfc-editor-index-updates -d 1969-01-01 diff --git a/bin/hourly b/bin/hourly index 4e50a6c0c..009818f2f 100755 --- a/bin/hourly +++ b/bin/hourly @@ -12,54 +12,58 @@ cd $DTDIR/ # Set up the virtual environment source $DTDIR/bin/activate -# Update community lists. Remove once the community rewrite (will be around 6.20.0 ) -$DTDIR/ietf/manage.py update_community_lists +logger -p user.info -t cron "Running $DTDIR/bin/hourly" -# Polling backup for iana and rfc-editory post APIs -$DTDIR/ietf/bin/iana-changes-updates -$DTDIR/ietf/bin/iana-protocols-updates -$DTDIR/ietf/bin/rfc-editor-index-updates -$DTDIR/ietf/bin/rfc-editor-queue-updates +# *** Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: *** -# Generate alias and virtual files for draft email aliases -$DTDIR/ietf/bin/generate-draft-aliases && \ - ( cd /a/postfix; /usr/sbin/postalias -o draft-aliases; ) && \ - ( cd /a/postfix; /usr/sbin/postmap -o draft-virtual; ) - -# Generate alias and virtual files for group email aliases -$DTDIR/ietf/bin/generate-wg-aliases && \ - ( cd /a/postfix; /usr/sbin/postalias -o group-aliases; ) && \ - ( cd /a/postfix; /usr/sbin/postmap -o group-virtual; ) - -# Generate some static files -ID=/a/www/ietf-ftp/internet-drafts/ -DOWNLOAD=/a/www/www6s/download/ - -export TMPDIR=/a/tmp - -TMPFILE1=`mktemp` || exit 1 -TMPFILE2=`mktemp` || exit 1 -TMPFILE3=`mktemp` || exit 1 -TMPFILE4=`mktemp` || exit 1 -TMPFILE5=`mktemp` || exit 1 -TMPFILE6=`mktemp` || exit 1 -TMPFILE7=`mktemp` || exit 1 -chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7 - -python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1 -python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2 -python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3 -cp $TMPFILE1 $TMPFILE4 -cp $TMPFILE2 $TMPFILE5 -cp $TMPFILE3 $TMPFILE6 -python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7 - -mv $TMPFILE1 $ID/all_id.txt -mv $TMPFILE2 $ID/1id-index.txt -mv $TMPFILE3 $ID/1id-abstracts.txt -mv $TMPFILE4 $DOWNLOAD/id-all.txt -mv $TMPFILE5 $DOWNLOAD/id-index.txt -mv $TMPFILE6 $DOWNLOAD/id-abstract.txt -mv $TMPFILE7 $ID/all_id2.txt - -exit 0 +# # Update community lists. Remove once the community rewrite (will be around 6.20.0 ) +# $DTDIR/ietf/manage.py update_community_lists +# +# # Polling backup for iana and rfc-editory post APIs +# $DTDIR/ietf/bin/iana-changes-updates +# $DTDIR/ietf/bin/iana-protocols-updates +# $DTDIR/ietf/bin/rfc-editor-index-updates +# $DTDIR/ietf/bin/rfc-editor-queue-updates +# +# # Generate alias and virtual files for draft email aliases +# $DTDIR/ietf/bin/generate-draft-aliases && \ +# ( cd /a/postfix; /usr/sbin/postalias -o draft-aliases; ) && \ +# ( cd /a/postfix; /usr/sbin/postmap -o draft-virtual; ) +# +# # Generate alias and virtual files for group email aliases +# $DTDIR/ietf/bin/generate-wg-aliases && \ +# ( cd /a/postfix; /usr/sbin/postalias -o group-aliases; ) && \ +# ( cd /a/postfix; /usr/sbin/postmap -o group-virtual; ) +# +# # Generate some static files +# ID=/a/www/ietf-ftp/internet-drafts/ +# DOWNLOAD=/a/www/www6s/download/ +# +# export TMPDIR=/a/tmp +# +# TMPFILE1=`mktemp` || exit 1 +# TMPFILE2=`mktemp` || exit 1 +# TMPFILE3=`mktemp` || exit 1 +# TMPFILE4=`mktemp` || exit 1 +# TMPFILE5=`mktemp` || exit 1 +# TMPFILE6=`mktemp` || exit 1 +# TMPFILE7=`mktemp` || exit 1 +# chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7 +# +# python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1 +# python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2 +# python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3 +# cp $TMPFILE1 $TMPFILE4 +# cp $TMPFILE2 $TMPFILE5 +# cp $TMPFILE3 $TMPFILE6 +# python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7 +# +# mv $TMPFILE1 $ID/all_id.txt +# mv $TMPFILE2 $ID/1id-index.txt +# mv $TMPFILE3 $ID/1id-abstracts.txt +# mv $TMPFILE4 $DOWNLOAD/id-all.txt +# mv $TMPFILE5 $DOWNLOAD/id-index.txt +# mv $TMPFILE6 $DOWNLOAD/id-abstract.txt +# mv $TMPFILE7 $ID/all_id2.txt +# +# exit 0 diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py index dcb1a8a0d..38abf889b 100644 --- a/ietf/secr/announcement/forms.py +++ b/ietf/secr/announcement/forms.py @@ -27,7 +27,7 @@ FROM_LIST = ('IETF Secretariat ', 'IETF Registrar ', 'IETF Administrative Director ', 'IETF Executive Director ', - 'The IAOC ', + 'IAOC Chair ', 'The IETF Trust ', 'RSOC Chair ', 'ISOC Board of Trustees ',