altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Applied production patches to trunk.

Browse source 
- Legacy-Id: 11208
This commit is contained in:
Henrik Levkowetz 2016-05-19 20:03:19 +00:00
parent 29d3b7185c
commit ea4160a709
3 changed files with 66 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bin/daily
View file

@ -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

102
bin/hourly
View file

@ -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

2
ietf/secr/announcement/forms.py
View file

@ -27,7 +27,7 @@ FROM_LIST = ('IETF Secretariat <ietf-secretariat@ietf.org>',
'IETF Registrar <ietf-registrar@ietf.org>',
'IETF Administrative Director <iad@ietf.org>',
'IETF Executive Director <exec-director@ietf.org>',
'The IAOC <ldaigle@thinkingcat.com>',
'IAOC Chair <iaoc-chair@ietf.org>',
'The IETF Trust <ietf-trust@ietf.org>',
'RSOC Chair <rsoc-chair@iab.org>',
'ISOC Board of Trustees <bob.hinden@gmail.com>',