Skip to content

Commit ea4160a

Browse files
levkowetzlevkowetz
committed
Applied production patches to trunk.
 - Legacy-Id: 11208
1 parent 29d3b71 commit ea4160a

File tree

3 files changed

+66
-56
lines changed

3 files changed

+66
-56
lines changed

‎bin/daily‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,31 @@
66
# $DTDIR/etc/cron.d/datatracker which should be symlinked from
77
# /etc/cron.d/
88

9+
# Run the hourly jobs first
10+
$DTDIR/bin/hourly
11+
12+
# Datatracker directory
913
DTDIR=/a/www/ietf-datatracker/web
1014
cd $DTDIR/
1115

16+
logger -p user.info -t cron "Running $DTDIR/bin/daily"
17+
1218
# Set up the virtual environment
1319
source $DTDIR/bin/activate
1420

15-
# Run the hourly jobs first
16-
$DTDIR/bin/hourly
17-
1821
# Populate the yang repositories
1922
$DTDIR/ietf/manage.py populate_yang_model_dirs
2023

2124
# Expire internet drafts
22-
$DTDIR/ietf/bin/expire-ids
25+
# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
26+
#$DTDIR/ietf/bin/expire-ids
2327

2428
# Expire last calls
25-
$DTDIR/ietf/bin/expire-last-calls
29+
# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
30+
#$DTDIR/ietf/bin/expire-last-calls
2631

2732
# Run an extended version of the rfc editor update, to catch changes
2833
# with backdated timestamps
29-
$DTDIR/ietf/bin/rfc-editor-index-updates -d 1969-01-01
34+
# Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:
35+
#$DTDIR/ietf/bin/rfc-editor-index-updates -d 1969-01-01
3036

‎bin/hourly‎

Lines changed: 53 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -12,54 +12,58 @@ cd $DTDIR/
1212
# Set up the virtual environment
1313
source $DTDIR/bin/activate
1414

15-
# Update community lists. Remove once the community rewrite (will be around 6.20.0 )
16-
$DTDIR/ietf/manage.py update_community_lists
15+
logger -p user.info -t cron "Running $DTDIR/bin/hourly"
1716

18-
# Polling backup for iana and rfc-editory post APIs
19-
$DTDIR/ietf/bin/iana-changes-updates
20-
$DTDIR/ietf/bin/iana-protocols-updates
21-
$DTDIR/ietf/bin/rfc-editor-index-updates
22-
$DTDIR/ietf/bin/rfc-editor-queue-updates
17+
# *** Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner: ***
2318

24-
# Generate alias and virtual files for draft email aliases
25-
$DTDIR/ietf/bin/generate-draft-aliases && \
26-
( cd /a/postfix; /usr/sbin/postalias -o draft-aliases; ) && \
27-
( cd /a/postfix; /usr/sbin/postmap -o draft-virtual; )
28-
29-
# Generate alias and virtual files for group email aliases
30-
$DTDIR/ietf/bin/generate-wg-aliases && \
31-
( cd /a/postfix; /usr/sbin/postalias -o group-aliases; ) && \
32-
( cd /a/postfix; /usr/sbin/postmap -o group-virtual; )
33-
34-
# Generate some static files
35-
ID=/a/www/ietf-ftp/internet-drafts/
36-
DOWNLOAD=/a/www/www6s/download/
37-
38-
export TMPDIR=/a/tmp
39-
40-
TMPFILE1=`mktemp` || exit 1
41-
TMPFILE2=`mktemp` || exit 1
42-
TMPFILE3=`mktemp` || exit 1
43-
TMPFILE4=`mktemp` || exit 1
44-
TMPFILE5=`mktemp` || exit 1
45-
TMPFILE6=`mktemp` || exit 1
46-
TMPFILE7=`mktemp` || exit 1
47-
chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7
48-
49-
python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1
50-
python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2
51-
python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3
52-
cp $TMPFILE1 $TMPFILE4
53-
cp $TMPFILE2 $TMPFILE5
54-
cp $TMPFILE3 $TMPFILE6
55-
python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7
56-
57-
mv $TMPFILE1 $ID/all_id.txt
58-
mv $TMPFILE2 $ID/1id-index.txt
59-
mv $TMPFILE3 $ID/1id-abstracts.txt
60-
mv $TMPFILE4 $DOWNLOAD/id-all.txt
61-
mv $TMPFILE5 $DOWNLOAD/id-index.txt
62-
mv $TMPFILE6 $DOWNLOAD/id-abstract.txt
63-
mv $TMPFILE7 $ID/all_id2.txt
64-
65-
exit 0
19+
# # Update community lists. Remove once the community rewrite (will be around 6.20.0 )
20+
# $DTDIR/ietf/manage.py update_community_lists
21+
#
22+
# # Polling backup for iana and rfc-editory post APIs
23+
# $DTDIR/ietf/bin/iana-changes-updates
24+
# $DTDIR/ietf/bin/iana-protocols-updates
25+
# $DTDIR/ietf/bin/rfc-editor-index-updates
26+
# $DTDIR/ietf/bin/rfc-editor-queue-updates
27+
#
28+
# # Generate alias and virtual files for draft email aliases
29+
# $DTDIR/ietf/bin/generate-draft-aliases && \
30+
# ( cd /a/postfix; /usr/sbin/postalias -o draft-aliases; ) && \
31+
# ( cd /a/postfix; /usr/sbin/postmap -o draft-virtual; )
32+
#
33+
# # Generate alias and virtual files for group email aliases
34+
# $DTDIR/ietf/bin/generate-wg-aliases && \
35+
# ( cd /a/postfix; /usr/sbin/postalias -o group-aliases; ) && \
36+
# ( cd /a/postfix; /usr/sbin/postmap -o group-virtual; )
37+
#
38+
# # Generate some static files
39+
# ID=/a/www/ietf-ftp/internet-drafts/
40+
# DOWNLOAD=/a/www/www6s/download/
41+
#
42+
# export TMPDIR=/a/tmp
43+
#
44+
# TMPFILE1=`mktemp` || exit 1
45+
# TMPFILE2=`mktemp` || exit 1
46+
# TMPFILE3=`mktemp` || exit 1
47+
# TMPFILE4=`mktemp` || exit 1
48+
# TMPFILE5=`mktemp` || exit 1
49+
# TMPFILE6=`mktemp` || exit 1
50+
# TMPFILE7=`mktemp` || exit 1
51+
# chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7
52+
#
53+
# python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1
54+
# python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2
55+
# python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3
56+
# cp $TMPFILE1 $TMPFILE4
57+
# cp $TMPFILE2 $TMPFILE5
58+
# cp $TMPFILE3 $TMPFILE6
59+
# python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7
60+
#
61+
# mv $TMPFILE1 $ID/all_id.txt
62+
# mv $TMPFILE2 $ID/1id-index.txt
63+
# mv $TMPFILE3 $ID/1id-abstracts.txt
64+
# mv $TMPFILE4 $DOWNLOAD/id-all.txt
65+
# mv $TMPFILE5 $DOWNLOAD/id-index.txt
66+
# mv $TMPFILE6 $DOWNLOAD/id-abstract.txt
67+
# mv $TMPFILE7 $ID/all_id2.txt
68+
#
69+
# exit 0

‎ietf/secr/announcement/forms.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
'IETF Registrar <ietf-registrar@ietf.org>',
2828
'IETF Administrative Director <iad@ietf.org>',
2929
'IETF Executive Director <exec-director@ietf.org>',
30-
'The IAOC <ldaigle@thinkingcat.com>',
30+
'IAOC Chair <iaoc-chair@ietf.org>',
3131
'The IETF Trust <ietf-trust@ietf.org>',
3232
'RSOC Chair <rsoc-chair@iab.org>',
3333
'ISOC Board of Trustees <bob.hinden@gmail.com>',

0 commit comments

Comments
 (0)