From 101e8e22c2b848cf6a0a68110457498c7caec929 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Wed, 21 Oct 2020 11:03:05 +0000
Subject: [PATCH] Updated paths after directory moves on production server  -
 Legacy-Id: 18624

---
 bin/hourly       | 21 ++++++++++++++++++---
 ietf/settings.py |  6 +++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/bin/hourly b/bin/hourly
index c94328b3d..2e4355260 100755
--- a/bin/hourly
+++ b/bin/hourly
@@ -41,8 +41,9 @@ $DTDIR/ietf/bin/iana-protocols-updates
 # 	( 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/
+ID=/a/ietfdata/doc/draft/repository
+DERIVED=/a/ietfdata/derived
+DOWNLOAD=/a/www/www6s/download
 
 export TMPDIR=/a/tmp
 
@@ -53,7 +54,12 @@ 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
+TMPFILE8=`mktemp` || exit 1
+TMPFILE9=`mktemp` || exit 1
+TMPFILEA=`mktemp` || exit 1
+TMPFILEB=`mktemp` || exit 1
+
+chmod a+r $TMPFILE1 $TMPFILE2 $TMPFILE3 $TMPFILE4 $TMPFILE5 $TMPFILE6 $TMPFILE7 $TMPFILE8 $TMPFILE9 $TMPFILEA $TMPFILEB
 
 python -m ietf.idindex.generate_all_id_txt >> $TMPFILE1
 python -m ietf.idindex.generate_id_index_txt >> $TMPFILE2
@@ -61,7 +67,11 @@ python -m ietf.idindex.generate_id_abstracts_txt >> $TMPFILE3
 cp $TMPFILE1 $TMPFILE4
 cp $TMPFILE2 $TMPFILE5
 cp $TMPFILE3 $TMPFILE6
+cp $TMPFILE1 $TMPFILE8
+cp $TMPFILE2 $TMPFILE9
+cp $TMPFILE3 $TMPFILEA
 python -m ietf.idindex.generate_all_id2_txt >> $TMPFILE7
+cp $TMPFILE7 $TMPFILEB
 
 mv $TMPFILE1 $ID/all_id.txt
 mv $TMPFILE2 $ID/1id-index.txt
@@ -70,6 +80,11 @@ mv $TMPFILE4 $DOWNLOAD/id-all.txt
 mv $TMPFILE5 $DOWNLOAD/id-index.txt
 mv $TMPFILE6 $DOWNLOAD/id-abstract.txt
 mv $TMPFILE7 $ID/all_id2.txt
+mv $TMPFILE8 $DERIVED/all_id.txt
+mv $TMPFILE9 $DERIVED/1id-index.txt
+mv $TMPFILEA $DERIVED/1id-abstracts.txt
+mv $TMPFILEB $DERIVED/all_id2.txt
+
 
 CHARTER=/a/www/ietf-ftp/charter
 wget -q https://datatracker.ietf.org/wg/1wg-charters-by-acronym.txt -O $CHARTER/1wg-charters-by-acronym.txt
diff --git a/ietf/settings.py b/ietf/settings.py
index 7ec18ab71..dd23dca3f 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -650,7 +650,7 @@ URL_REGEXPS = {
 # Override this in settings_local.py if needed
 # *_PATH variables ends with a slash/ .
 DOCUMENT_PATH_PATTERN = '/a/www/ietf-ftp/{doc.type_id}/'
-INTERNET_DRAFT_PATH = '/a/www/ietf-ftp/internet-drafts/'
+INTERNET_DRAFT_PATH = '/a/ietfdata/doc/draft/repository'
 INTERNET_DRAFT_PDF_PATH = '/a/www/ietf-datatracker/pdf/'
 RFC_PATH = '/a/www/ietf-ftp/rfc/'
 CHARTER_PATH = '/a/www/ietf-ftp/charter/'
@@ -665,10 +665,10 @@ IESG_MINUTES_FILE = '/a/www/www6/iesg/internal/minutes.txt'
 IESG_MINUTES_URL = 'https://www6.ietf.org/iesg/internal/minutes.txt'
 IESG_WG_EVALUATION_DIR = "/a/www/www6/iesg/evaluation"
 # Move drafts to this directory when they expire
-INTERNET_DRAFT_ARCHIVE_DIR = '/a/www/www6s/draft-archive'
+INTERNET_DRAFT_ARCHIVE_DIR = '/a/ietfdata/doc/draft/collection/draft-archive/'
 # The following directory contains linked copies of all drafts, but don't
 # write anything to this directory -- its content is maintained by ghostlinkd:
-INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/a/www/www6s/archive/id'
+INTERNET_ALL_DRAFTS_ARCHIVE_DIR = '/a/ietfdata/doc/draft/archive'
 MEETING_RECORDINGS_DIR = '/a/www/audio'
 
 DOCUMENT_FORMAT_WHITELIST = ["txt", "ps", "pdf", "xml", "html", ]