Changes to reflect repository moves. Commit ready for merge.

rjsparks · rjsparks · commit ceb7121018f8 · 2021-05-14T21:51:21.000Z
- Legacy-Id: 18997
diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
@@ -351,7 +351,7 @@ def add_links_in_new_revision_events(doc, events, diff_revisions):
         full_url = diff_url = diff_urls[(e.doc.name, e.rev)]
 
         if doc.type_id in "draft": # work around special diff url for drafts
-            full_url = "https://tools.ietf.org/id/" + diff_url + ".txt"
+            full_url = "https://www.ietf.org/archive/id/" + diff_url + ".txt"
 
         # build links
         links = r'<a href="%s">\1</a>' % full_url
diff --git a/ietf/release/views.py b/ietf/release/views.py
@@ -28,9 +28,9 @@
 
 def trac_links(text):
     # changeset links
-    text = re.sub(r'\[(\d+)\]', r'<a href="https://wiki.tools.ietf.org/tools/ietfdb/changeset/\1">[\1]</a>', text)
+    text = re.sub(r'\[(\d+)\]', r'<a href="https://trac.ietf.org/trac/ietfdb/changeset/\1">[\1]</a>', text)
     # issue links
-    text = re.sub(r'([^&])#(\d+)', r'\1<a href="https://wiki.tools.ietf.org/tools/ietfdb/ticket/\2">#\2</a>', text)
+    text = re.sub(r'([^&])#(\d+)', r'\1<a href="https://trac.ietf.org/trac/ietfdb/ticket/\2">#\2</a>', text)
     return text
 
 
diff --git a/ietf/templates/500.html b/ietf/templates/500.html
@@ -19,7 +19,7 @@ <h2>Internal Server Error.</h2>
     A failure report with details about what happened has been sent to the
     server administrators.  It would be helpful if you would file a bug
     report with additional information at the
-    <a href="https://trac.tools.ietf.org/tools/ietfdb/newticket">IETF database issue tracker</a>, too.
+    <a href="https://trac.ietf.org/trac/ietfdb/newticket">IETF database issue tracker</a>, too.
   </p>
 
 {% endblock %}
diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html
@@ -23,11 +23,11 @@ <h3 id="framework" class="anchor-target">Framework  API</h3>
       </p>
 
       <p>
-        <a href="http://svn.tools.ietf.org/svn/tools/ietfdb/trunk/ietf/doc/models.py">https://svn.tools.ietf.org/svn/tools/ietfdb/trunk/ietf/doc/models.py</a>
+        <a href="http://svn.ietf.org/svn/tools/ietfdb/trunk/ietf/doc/models.py">https://svn.ietf.org/svn/tools/ietfdb/trunk/ietf/doc/models.py</a>
         <br>
-        <a href="http://svn.tools.ietf.org/svn/tools/ietfdb/trunk/ietf/group/models.py">https://svn.tools.ietf.org/svn/tools/ietfdb/trunk/ietf/group/models.py</a>
+        <a href="http://svn.ietf.org/svn/tools/ietfdb/trunk/ietf/group/models.py">https://svn.ietf.org/svn/tools/ietfdb/trunk/ietf/group/models.py</a>
         <br>
-        <a href="http://svn.tools.ietf.org/svn/tools/ietfdb/trunk/ietf/iesg/models.py">http://svn.tools.ietf.org/svn/tools/ietfdb/trunk/ietf/iesg/models.py</a>
+        <a href="http://svn.ietf.org/svn/tools/ietfdb/trunk/ietf/iesg/models.py">http://svn.ietf.org/svn/tools/ietfdb/trunk/ietf/iesg/models.py</a>
         <br>
         &hellip;
 
@@ -45,7 +45,7 @@ <h3 id="framework" class="anchor-target">Framework  API</h3>
 
         <a href="https://datatracker.ietf.org/api/v1/group/group/">https://datatracker.ietf.org/api/v1/group/group/</a>
         <br>
-        <a href="https://trac.tools.ietf.org/tools/ietfdb/browser/trunk/ietf/group/models.py">https://trac.tools.ietf.org/tools/ietfdb/browser/trunk/ietf/group/models.py</a>
+        <a href="https://trac.ietf.org/trac/ietfdb/browser/trunk/ietf/group/models.py">https://trac.ietf.org/trac/ietfdb/browser/trunk/ietf/group/models.py</a>
 
       </p>
       <p>
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
@@ -145,7 +145,7 @@
 	          {{revision_date}} |
 	        {% endif %}
 		Report a bug:
-	        <a href="https://tools.ietf.org/tools/ietfdb/newticket">Tracker:<span class="fa fa-bug"></span></a>
+	        <a href="https://trac.ietf.org/trac/ietfdb/newticket">Tracker:<span class="fa fa-bug"></span></a>
                 {% if bugreport_email %}
 	        <a href="mailto:{{ bugreport_email }}">Email:<span class="fa fa-envelope"></span></a>
                 {% endif %}
diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html
@@ -149,7 +149,7 @@
   <li><a href="/api/">API Help</a></li>  
   <li><a href="{% url 'ietf.release.views.release' %}">Release notes</a></li>
   {% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
-  <li><a href="https://tools.ietf.org/tools/ietfdb/newticket"><span class="fa fa-bug"></span> Report a bug</a></li>
+  <li><a href="https://trac.ietf.org/trac/ietfdb/newticket"><span class="fa fa-bug"></span> Report a bug</a></li>
 {% if flavor == "top" %}</ul>{% endif %}
 
 {% if flavor == "top" %}
diff --git a/ietf/templates/group/group_about_status.html b/ietf/templates/group/group_about_status.html
@@ -25,6 +25,6 @@ <h1>
 
   {% if can_provide_status_update %}
   <h2>About Status Updates</h2>
-  <p>Capturing group status updates in the datatracker allows including them in meeting proceedings. This capability was added to address the IESG request at <a href="https://wiki.tools.ietf.org/tools/ietfdb/ticket/1773">ticket 1773</a>. Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see <a href="https://mailarchive.ietf.org/arch/msg/saag/fo2b3KA47SM4MuQuYj5VIh-Tjok">the Kitten report sent to SAAG for IETF94</a> or the <a href="https://trac.tools.ietf.org/area/rtg/trac/wiki/IETF94summary">Routing area high level summaries for IETF94</a>.</p>
+  <p>Capturing group status updates in the datatracker allows including them in meeting proceedings. This capability was added to address the IESG request at <a href="https://trac.ietf.org/trac/ietfdb/ticket/1773">ticket 1773</a>. Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see <a href="https://mailarchive.ietf.org/arch/msg/saag/fo2b3KA47SM4MuQuYj5VIh-Tjok">the Kitten report sent to SAAG for IETF94</a> or the <a href="https://trac.ietf.org/trac/rtg/wiki/IETF94summary">Routing area high level summaries for IETF94</a>.</p>
   {% endif %}
 {% endblock %}
diff --git a/ietf/templates/group/group_about_status_edit.html b/ietf/templates/group/group_about_status_edit.html
@@ -26,7 +26,7 @@ <h1>
 
   <h2>About Status Updates</h2>
   <p>Capturing group status updates in the datatracker allows including them in meeting proceedings. This capability was
-added to address the IESG request at <a href="https://wiki.tools.ietf.org/tools/ietfdb/ticket/1773">ticket 1773</a>.
-Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see <a href="https://mailarchive.ietf.org/arch/msg/saag/fo2b3KA47SM4MuQuYj5VIh-Tjok">the Kitten report sent to SAAG for IETF94</a> or the <a href="https://trac.tools.ietf.org/area/rtg/trac/wiki/IETF94summary">Routing area high level summaries for IETF94</a>.</p>
+added to address the IESG request at <a href="https://trac.ietf.org/tools/ietfdb/ticket/1773">ticket 1773</a>.
+Not all groups are expected to provide status updates. Those that do have historically sent messages by email or have placed them on a wiki. For example, see <a href="https://mailarchive.ietf.org/arch/msg/saag/fo2b3KA47SM4MuQuYj5VIh-Tjok">the Kitten report sent to SAAG for IETF94</a> or the <a href="https://trac.ietf.org/trac/rtg/wiki/IETF94summary">Routing area high level summaries for IETF94</a>.</p>
 
 {% endblock %}
diff --git a/ietf/templates/release/about.html b/ietf/templates/release/about.html
@@ -23,9 +23,9 @@ <h1>About the IETF Datatracker</h1>
    <p>
 
       All the Datatracker code is publicly avaliable from the
-      <a href="https://svn.tools.ietf.org/svn/tools/ietfdb">IETF tools SVN repository</a>.
+      <a href="https://svn.ietf.org/svn/tools/ietfdb">IETF tools SVN repository</a>.
       Bug tickets and wiki notes are available from the 
-      <a href="https://trac.tools.ietf.org/tools/ietfdb">Issue Tracker</a>, and 
+      <a href="https://trac.ietf.org/trac/ietfdb">Issue Tracker</a>, and 
       there are also <a href="/release">release notes</a> available since version 2.00.
 
    </p>
@@ -53,7 +53,7 @@ <h2>Version 6.0.0: Facelift using Bootstrap</h2>
      During more than a year, from July 2013 to late 2014, <i>Lars Eggert</i> worked intensively
      on a major facelift to the datatracker, porting the GUI to Bootstrap.  The work
      took
-     <a href="https://trac.tools.ietf.org/tools/ietfdb/log/personal/lars?rev=8652&amp;stop_rev=5871&amp;limit=500">
+     <a href="https://trac.ietf.org/trac/ietfdb/log/personal/lars?rev=8652&amp;stop_rev=5871&amp;limit=500">
 	287 separate commits
      </a>, and comprised changes to 1016 different files.
 
@@ -76,10 +76,10 @@ <h2>Version 6.0.0: Facelift using Bootstrap</h2>
   <p>
 
      Additional
-     <a href="https://trac.tools.ietf.org/tools/ietfdb/log/branch/iola?rev=9116&amp;stop_rev=8520&amp;limit=200">
+     <a href="https://trac.ietf.org/trac/ietfdb/log/branch/iola?rev=9116&amp;stop_rev=8520&amp;limit=200">
 	page conversion work
      </a> has been done by <i>Ole Laursen</i>, with
-     <a href="https://trac.tools.ietf.org/tools/ietfdb/log/personal/henrik/facelift-r9116">
+     <a href="https://trac.ietf.org/trac/ietfdb/log/personal/henrik/facelift-r9116">
 	final style tweaks, bug-fixes and adaptations
      </a>
      by <i>Henrik Levkowetz</i>, giving it a distinct
@@ -104,7 +104,7 @@ <h2>Version 5.x Work</h2>
      the addition of pages for <a href="/rg/">Research Groups</a> and <a
      href="/group/edu">Teams</a>, a <a href="/api/v1/?format=json">JSON interface</a> to the
      database for tool builders, improved <a href="/ipr/">IPR support</a>, a move to Django 1.7,
-     and many <a href="https://trac.tools.ietf.org/tools/ietfdb/wiki/Testing?version=13">
+     and many <a href="https://trac.ietf.org/trac/ietfdb/wiki/Testing?version=13">
      improvements in testing support</a>.
 
   </p>
diff --git a/ietf/templates/release/release.html b/ietf/templates/release/release.html
@@ -16,7 +16,7 @@
   {% origin %}
 <div class="col-sm-12">
   <h1>
-    <a href="https://trac.tools.ietf.org/tools/ietfdb/browser/tags/{{entry.version}}">
+    <a href="https://trac.ietf.org/trac/ietfdb/browser/tags/{{entry.version}}">
       Version {{ entry.version }}</a>
     <br><small>Released {{ entry.date }}</small>
     <div class="pull-right"><a href="{% url "ietf.release.views.stats" %}" class="icon-link">&nbsp;<span class="small fa fa-bar-chart">&nbsp;</span></a></div>
@@ -82,7 +82,7 @@ <h2>Release list:</h2>
 
 {% block footer %}
 	  <div class="col-md-12 text-center padded-top">
-	    <a href="https://trac.tools.ietf.org/tools/ietfdb/wiki/ContractorInstructions"><i>Contractor instructions</i></a>
+	    <a href="https://trac.ietf.org/trac/ietfdb/wiki/ContractorInstructions"><i>Contractor instructions</i></a>
 	  </div>
           {{ block.super }}
 {% endblock %}
diff --git a/ietf/templates/submit/announce_new_version.txt b/ietf/templates/submit/announce_new_version.txt
@@ -12,8 +12,5 @@ https://datatracker.ietf.org/doc/{{ submission.name }}/
 Diff from previous version:
 {{rfcdiff_base_url}}?url2={{ submission.name }}-{{ submission.rev }}
 
-Please note that it may take a couple of minutes from the time of submission
-until the diff is available at tools.ietf.org.
-
 IETF Secretariat.
 {% endautoescape %}
diff --git a/ietf/templates/utils/wiki/IetfSpecificFeatures b/ietf/templates/utils/wiki/IetfSpecificFeatures
@@ -4,9 +4,8 @@
 
 In order to create and edit wiki pages and issues, you need to log in.  Click on the
 small 'Login' link above the main horizontal menubar.  You log in with the same
-username (your email address) and password as for all other ''tools.ietf.org'' password
-protected accesses.  If you don't have a login/passwd or need to reset your passwd, go
-to http://tools.ietf.org/newpasswd .
+username (your email address) and password as the datatracker.  If you don't have a 
+login/passwd or need to reset your passwd, go to https://datatracker.ietf.org/accounts/create/.
 
 The login and password is also used for commits to the SVN repository.  See more about
 the repository further down.
@@ -28,18 +27,6 @@ in Trac:
    associate issues with drafts for the WG participants, without the Chairs needing to
    go in as admin users and add a new component each time there's a new WG draft.
 
- * The 'Severity' field of an issue has a special significance if the issue type is
-   set to 'state' or 'task'.  In that case, the Severity will be shown as an
-   annotation to the draft state on the regular WG status page on tools.ietf.org.
-   This can be useful for WG chairs to indicate more exactly the state of a WG draft,
-   which will otherwise simply be indicated as 'Active' on the status page, until it
-   is sent to the IESG for processing.
-
- * If issues are registered against a draft ,indicated by setting the issue's
-   'component' field to the appropriate (abbreviated) draft name, the status page
-   will show a progress bar, indicating the total number of issues for that draft, as
-   well as the proportion which have been closed, and the number of still open issues.
-
  * Everywhere you can use wiki markup (on the wiki pages, roadmap descriptions,
    etc.) you may embed a macro which shows a ticket statistics graph.  Full
    information about the macro is available at [http://trac-hacks.org/wiki/TicketStatsMacro].
@@ -49,46 +36,3 @@ in Trac:
    }}}
    which gives this result: [[TicketStats( height=250,daterange=12m,res_days=30)]]
 
-Issue tracker changes which are reflected in the WG status pages ('Severity'
-annotations and issue progress bars) may take up to 1 hour to propagate from the
-server which hosts the Trac instance (trac.tools.ietf.org) to the other tools servers.
-
-== Integration with tools.ietf.org ==
-
-For all working groups which have an instance of Trac installed, the URL to Trac for
-that WG has the form '''''!http://tools.ietf.org/wg/<wg>/trac'''''.
-There's also a link to the Trac issue tracker and a link to the Trac
-wiki in the horizontal menu on the WG status page
-'''''!http://tools.ietf.org/wg/<wg>'''''
-once Trac has been installed.
-
-== SVN Repository ==
-
-For each WG with a Trac instance there is also a SVN repository, with an URL of the
-form '''''!https://svn.tools.ietf.org/svn/wg/<wg>'''''.  Anybody can check out from
-the repository, but you need to use the tools server login and password in order to
-commit to the repository.
-
-To check out a repository with a command-line svn client, see this example for the ''hybi'' WG:
-
-{{{
-work/ $ svn co --username=henrik@levkowetz.com https://svn.tools.ietf.org/svn/wg/hybi/
-work/ $ cd hybi/
-hybi/ $
-}}}
-
-SVN also lets you check out parts of the repository tree, but for more info on
-that, please see the documentation on http://subversion.apache.org/.
-
-To add a document to the repository, place the document in your SVN working folder,
-tell SVN it should be added, and when ready, commit it to the repository:
-{{{
-hybi/ $ svn add draft-foo-bar-baz.txt
-hybi/ $ #...
-hybi/ $ svn commit draft-foo-bar-baz.txt -m "Commit message ..."
-hybi/ $
-}}}
-
-The IETF Trac instances use a variation of the Trac SVN hook script which is provided
-with Trac.  This script updates Track Issue Tickets based on keywords in the SVN
-commit messages; the keywords and their use is described in SvnTracHooks.
diff --git a/ietf/templates/utils/wiki/SvnTracHooks b/ietf/templates/utils/wiki/SvnTracHooks
@@ -71,7 +71,3 @@ can take any of the following forms:
   Resolve #140: rephrase note so that it becomes clear that the described ...
 }}}
 
-=== Script ===
-
-The default script installed as trac-post-commit-hook is:
-http://tools.ietf.org/tools/wg-pages/svn-hook-files/trac-post-commit-hook
