chore: use variable for static.ietf.org references (#5692)

.devcontainer/devcontainer.json

@@ -66,7 +66,7 @@
     },
     
     // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    "forwardPorts": [8000, 5432, 5433],
+    "forwardPorts": [3000, 5432, 5433, 8000, 8001],
     
     "portsAttributes": {
         "3000": {
@@ -84,6 +84,10 @@
         "8000": {
             "label": "Datatracker",
             "onAutoForward": "notify"
+        },
+        "8001": {
+            "label": "Static",
+            "onAutoForward": "silent"
         }
     },
     

docker-compose.yml

@@ -59,6 +59,12 @@ services:
         volumes:
             - ./docker/configs/pgadmin-servers.json:/pgadmin4/servers.json
 
+    static:
+        image: ghcr.io/ietf-tools/static:latest
+        restart: unless-stopped
+        ports:
+            - 8001:80
+
     mq:
         image: rabbitmq:3-alpine
         restart: unless-stopped

docker/configs/settings_local.py

@@ -55,3 +55,5 @@ NOMCOM_PUBLIC_KEYS_DIR = 'data/nomcom_keys/public_keys/'
 SLIDE_STAGING_PATH = 'test/staging/'
 
 DE_GFM_BINARY = '/usr/local/bin/de-gfm'
+
+STATIC_IETF_ORG = "http://localhost:8001"

ietf/doc/models.py

@@ -627,7 +627,7 @@ class DocumentInfo(models.Model):
             stylesheets.append(finders.find("ietf/css/document_html_txt.css"))
         else:
             text = self.htmlized()
-        stylesheets.append("https://static.ietf.org/fonts/noto-sans-mono/import.css")
+        stylesheets.append(f'{settings.STATIC_IETF_ORG}/fonts/noto-sans-mono/import.css')
 
         cache = caches["pdfized"]
         cache_key = name.split(".")[0]

ietf/settings.py

@@ -137,7 +137,6 @@ IETF_NOTES_URL = 'https://notes.ietf.org/'  # HedgeDoc base URL
 # Absolute path to the directory static files should be collected to.
 # Example: "/var/www/example.com/static/"
 
-
 SERVE_CDN_PHOTOS = True
 
 SERVE_CDN_FILES_LOCALLY_IN_DEV_MODE = True
@@ -157,6 +156,8 @@ STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
+STATIC_IETF_ORG = "https://static.ietf.org"
+
 WSGI_APPLICATION = "ietf.wsgi.application"
 
 AUTHENTICATION_BACKENDS = ( 'ietf.ietfauth.backends.CaseInsensitiveModelBackend', )

ietf/templates/base.html

@@ -15,8 +15,8 @@
             {% block title %}No title{% endblock %}
         </title>
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href="https://static.ietf.org/fonts/inter/import.css" rel="stylesheet">
+        <link href="{{ settings.STATIC_IETF_ORG }}/fonts/inter/import.css" rel="stylesheet">
-        <link href="https://static.ietf.org/fonts/noto-sans-mono/import.css" rel="stylesheet">
+        <link href="{{ settings.STATIC_IETF_ORG }}/fonts/noto-sans-mono/import.css" rel="stylesheet">
         <link rel="stylesheet" href="{% static 'ietf/css/ietf.css' %}">
         <link rel="stylesheet" href="{% static 'ietf/css/select2.css' %}">
         <style>

ietf/templates/doc/document_html.html

@@ -18,8 +18,8 @@
             {% endif %}
         </title>
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link href="https://static.ietf.org/fonts/inter/import.css" rel="stylesheet">
+        <link href="{{ settings.STATIC_IETF_ORG }}/fonts/inter/import.css" rel="stylesheet">
-        <link href="https://static.ietf.org/fonts/noto-sans-mono/import.css" rel="stylesheet">
+        <link href="{{ settings.STATIC_IETF_ORG }}/fonts/noto-sans-mono/import.css" rel="stylesheet">
         {% if request.COOKIES.pagedeps == 'inline' %}
             <script>{{ js|safe }}</script>
             <style>{{ css|safe }}</style>