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

Merge pull request #5679 from ietf-tools/dev/merge-main-5679

Browse source 
chore: Merge main into feat/django4
This commit is contained in:
Jennifer Richards 2023-05-23 12:11:29 -03:00 committed by GitHub
parent 22e80ce4db e973672c25
commit d95269a205
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/build.yml vendored
View file

@ -450,6 +450,8 @@ jobs:
if: ${{ !failure() && !cancelled() && github.event.inputs.sandbox == 'true' }}
needs: [prepare, release]
runs-on: [self-hosted, dev-server]
environment:
name: sandbox
env:
PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}
@ -485,6 +487,9 @@ jobs:
if: ${{ !failure() && !cancelled() && github.event.inputs.legacySandbox == 'true' }}
needs: [prepare, release]
runs-on: [self-hosted, legacy-sandbox-server]
environment:
name: legacy-sandbox
url: "https://sandbox.ietf.org"
env:
PKG_VERSION: ${{needs.prepare.outputs.pkg_version}}

2
bin/daily
View file

@ -34,7 +34,7 @@ $DTDIR/ietf/manage.py update_external_command_info
rsync -avzq --delete /a/www/ietf-ftp/iana/yang-parameters/ /a/www/ietf-ftp/yang/ianamod/
# Get Yang models from Yangcatalog.
rsync -avzq rsync://yangcatalog.org:10873/yangdeps /a/www/ietf-ftp/yang/catalogmod/
rsync -avzq rsync://rsync.yangcatalog.org:10873/yangdeps /a/www/ietf-ftp/yang/catalogmod/
# Populate the yang repositories
$DTDIR/ietf/manage.py populate_yang_model_dirs -v0

6
ietf/settings.py
View file

@ -342,8 +342,6 @@ CSRF_TRUSTED_ORIGINS = [
"https://*.ietf.org",
'https://meetecho.com',
'https://*.meetecho.com',
'https://gather.town',
'https://*.gather.town',
]
CSRF_COOKIE_SAMESITE = 'None'
CSRF_COOKIE_SECURE = True
@ -555,7 +553,9 @@ IDNITS_BASE_URL = "https://author-tools.ietf.org/api/idnits"
IDNITS_SERVICE_URL = "https://author-tools.ietf.org/idnits"
# Content security policy configuration (django-csp)
CSP_DEFAULT_SRC = ("'self'", "'unsafe-inline'", f"data: {IDTRACKER_BASE_URL} https://www.ietf.org/ https://analytics.ietf.org/ https://fonts.googleapis.com/")
# (In current production, the Content-Security-Policy header is completely set by nginx configuration, but
# we try to keep this in sync to avoid confusion)
CSP_DEFAULT_SRC = ("'self'", "'unsafe-inline'", f"data: {IDTRACKER_BASE_URL} http://ietf.org/ https://www.ietf.org/ https://analytics.ietf.org/ https://static.ietf.org")
# The name of the method to use to invoke the test suite
TEST_RUNNER = 'ietf.utils.test_runner.IetfTestRunner'