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

chore: set gitattributes for normalizing line endings (#8245)

Browse source 
* chore: add proper .gitattributes

* chore: normalize file endings

* chore: fix .gitattributes

* chore: normalize file endings (2)
This commit is contained in:
Nicolas Giard 2024-11-20 17:48:00 -05:00 committed by GitHub
parent 3c42d98c5d
commit bdf753e052
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 785 additions and 507 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

282
.gitattributes vendored
View file

@ -1,2 +1,280 @@
/.yarn/releases/** binary # Auto detect text files and perform LF normalization
/.yarn/plugins/** binary * text=auto
# ---------------------------------------------------
# Python Projects
# ---------------------------------------------------
# Source files
*.pxd text diff=python
*.py text diff=python
*.py3 text diff=python
*.pyw text diff=python
*.pyx text diff=python
*.pyz text diff=python
*.pyi text diff=python
# Binary files
*.db binary
*.p binary
*.pkl binary
*.pickle binary
*.pyc binary export-ignore
*.pyo binary export-ignore
*.pyd binary
# Jupyter notebook
*.ipynb text eol=lf
# ---------------------------------------------------
# Web Projects
# ---------------------------------------------------
# Source code
*.bash text eol=lf
*.bat text eol=crlf
*.cmd text eol=crlf
*.coffee text
*.css text diff=css
*.htm text diff=html
*.html text diff=html
*.inc text
*.ini text
*.js text
*.mjs text
*.cjs text
*.json text
*.jsx text
*.less text
*.ls text
*.map text -diff
*.od text
*.onlydata text
*.php text diff=php
*.pl text
*.ps1 text eol=crlf
*.py text diff=python
*.rb text diff=ruby
*.sass text
*.scm text
*.scss text diff=css
*.sh text eol=lf
.husky/* text eol=lf
*.sql text
*.styl text
*.tag text
*.ts text
*.tsx text
*.xml text
*.xhtml text diff=html
# Docker
Dockerfile text
# Documentation
*.ipynb text eol=lf
*.markdown text diff=markdown
*.md text diff=markdown
*.mdwn text diff=markdown
*.mdown text diff=markdown
*.mkd text diff=markdown
*.mkdn text diff=markdown
*.mdtxt text
*.mdtext text
*.txt text
AUTHORS text
CHANGELOG text
CHANGES text
CONTRIBUTING text
COPYING text
copyright text
*COPYRIGHT* text
INSTALL text
license text
LICENSE text
NEWS text
readme text
*README* text
TODO text
# Templates
*.dot text
*.ejs text
*.erb text
*.haml text
*.handlebars text
*.hbs text
*.hbt text
*.jade text
*.latte text
*.mustache text
*.njk text
*.phtml text
*.pug text
*.svelte text
*.tmpl text
*.tpl text
*.twig text
*.vue text
# Configs
*.cnf text
*.conf text
*.config text
.editorconfig text
.env text
.gitattributes text
.gitconfig text
.htaccess text
*.lock text -diff
package.json text eol=lf
package-lock.json text eol=lf -diff
pnpm-lock.yaml text eol=lf -diff
.prettierrc text
yarn.lock text -diff
*.toml text
*.yaml text
*.yml text
browserslist text
Makefile text
makefile text
# Fixes syntax highlighting on GitHub to allow comments
tsconfig.json linguist-language=JSON-with-Comments
# Heroku
Procfile text
# Graphics
*.ai binary
*.bmp binary
*.eps binary
*.gif binary
*.gifv binary
*.ico binary
*.jng binary
*.jp2 binary
*.jpg binary
*.jpeg binary
*.jpx binary
*.jxr binary
*.pdf binary
*.png binary
*.psb binary
*.psd binary
*.svg text
*.svgz binary
*.tif binary
*.tiff binary
*.wbmp binary
*.webp binary
# Audio
*.kar binary
*.m4a binary
*.mid binary
*.midi binary
*.mp3 binary
*.ogg binary
*.ra binary
# Video
*.3gpp binary
*.3gp binary
*.as binary
*.asf binary
*.asx binary
*.avi binary
*.fla binary
*.flv binary
*.m4v binary
*.mng binary
*.mov binary
*.mp4 binary
*.mpeg binary
*.mpg binary
*.ogv binary
*.swc binary
*.swf binary
*.webm binary
# Archives
*.7z binary
*.gz binary
*.jar binary
*.rar binary
*.tar binary
*.zip binary
# Fonts
*.ttf binary
*.eot binary
*.otf binary
*.woff binary
*.woff2 binary
# Executables
*.exe binary
*.pyc binary
# Prevents massive diffs caused by vendored, minified files
**/.yarn/releases/** binary
**/.yarn/plugins/** binary
# RC files (like .babelrc or .eslintrc)
*.*rc text
# Ignore files (like .npmignore or .gitignore)
*.*ignore text
# Prevents massive diffs from built files
dist/* binary
# ---------------------------------------------------
# Common
# ---------------------------------------------------
# Documents
*.bibtex text diff=bibtex
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.md text diff=markdown
*.mdx text diff=markdown
*.tex text diff=tex
*.adoc text
*.textile text
*.mustache text
*.csv text eol=crlf
*.tab text
*.tsv text
*.txt text
*.sql text
*.epub diff=astextplain
# Text files where line endings should be preserved
*.patch -text
# ---------------------------------------------------
# Vzic specific
# ---------------------------------------------------
*.pl text diff=perl
*.pm text diff=perl
# C/C++
*.c text diff=cpp
*.cc text diff=cpp
*.cxx text diff=cpp
*.cpp text diff=cpp
*.cpi text diff=cpp
*.c++ text diff=cpp
*.hpp text diff=cpp
*.h text diff=cpp
*.h++ text diff=cpp
*.hh text diff=cpp

16
dev/build/settings_local_collectstatics.py
View file

@ -1,8 +1,8 @@
# Copyright The IETF Trust 2007-2019, All Rights Reserved # Copyright The IETF Trust 2007-2019, All Rights Reserved
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from ietf import __version__ from ietf import __version__
from ietf.settings import * # pyflakes:ignore from ietf.settings import * # pyflakes:ignore
STATIC_URL = "https://static.ietf.org/dt/%s/"%__version__ STATIC_URL = "https://static.ietf.org/dt/%s/"%__version__
STATIC_ROOT = os.path.abspath(BASE_DIR + "/../static/") STATIC_ROOT = os.path.abspath(BASE_DIR + "/../static/")

64
dev/tests/docker-compose.debug.yml
View file

@ -1,32 +1,32 @@
# This docker-compose replicates the test workflow happening on GitHub during a PR / build check. # This docker-compose replicates the test workflow happening on GitHub during a PR / build check.
# To be used from the debug.sh script. # To be used from the debug.sh script.
version: '3.8' version: '3.8'
services: services:
app: app:
image: ghcr.io/ietf-tools/datatracker-app-base:latest image: ghcr.io/ietf-tools/datatracker-app-base:latest
command: -f /dev/null command: -f /dev/null
working_dir: /__w/datatracker/datatracker working_dir: /__w/datatracker/datatracker
entrypoint: tail entrypoint: tail
hostname: app hostname: app
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
environment: environment:
CI: 'true' CI: 'true'
GITHUB_ACTIONS: 'true' GITHUB_ACTIONS: 'true'
HOME: /github/home HOME: /github/home
deploy: deploy:
resources: resources:
limits: limits:
cpus: '2' cpus: '2'
memory: '7GB' memory: '7GB'
db: db:
image: ghcr.io/ietf-tools/datatracker-db:latest image: ghcr.io/ietf-tools/datatracker-db:latest
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- postgresdb-data:/var/lib/postgresql/data - postgresdb-data:/var/lib/postgresql/data
volumes: volumes:
postgresdb-data: postgresdb-data:

44
docker/configs/pgadmin-servers.json
View file

@ -1,22 +1,22 @@
{ {
"Servers": { "Servers": {
"1": { "1": {
"Name": "Local Dev", "Name": "Local Dev",
"Group": "Servers", "Group": "Servers",
"Host": "db", "Host": "db",
"Port": 5432, "Port": 5432,
"MaintenanceDB": "postgres", "MaintenanceDB": "postgres",
"Username": "django", "Username": "django",
"UseSSHTunnel": 0, "UseSSHTunnel": 0,
"TunnelPort": "22", "TunnelPort": "22",
"TunnelAuthentication": 0, "TunnelAuthentication": 0,
"KerberosAuthentication": false, "KerberosAuthentication": false,
"ConnectionParameters": { "ConnectionParameters": {
"sslmode": "prefer", "sslmode": "prefer",
"connect_timeout": 10, "connect_timeout": 10,
"sslcert": "<STORAGE_DIR>/.postgresql/postgresql.crt", "sslcert": "<STORAGE_DIR>/.postgresql/postgresql.crt",
"sslkey": "<STORAGE_DIR>/.postgresql/postgresql.key" "sslkey": "<STORAGE_DIR>/.postgresql/postgresql.key"
} }
} }
} }
} }

380
ietf/dbtemplate/fixtures/nomcom_templates.xml
View file

@ -1,190 +1,190 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<django-objects version="1.0"> <django-objects version="1.0">
<object pk="1" model="dbtemplate.dbtemplate"> <object pk="1" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/home.rst</field> <field type="CharField" name="path">/nomcom/defaults/home.rst</field>
<field type="CharField" name="title">Home page of group</field> <field type="CharField" name="title">Home page of group</field>
<field type="TextField" name="variables"></field> <field type="TextField" name="variables"></field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
<field type="TextField" name="content">Home page <field type="TextField" name="content">Home page
========= =========
This is the home page of the nomcom group.</field> This is the home page of the nomcom group.</field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="2" model="dbtemplate.dbtemplate"> <object pk="2" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/email/inexistent_person.txt</field> <field type="CharField" name="path">/nomcom/defaults/email/inexistent_person.txt</field>
<field type="CharField" name="title">Email sent to chair of nomcom and secretariat when Email and Person are created if some of them don't exist</field> <field type="CharField" name="title">Email sent to chair of nomcom and secretariat when Email and Person are created if some of them don't exist</field>
<field type="TextField" name="variables">$email: Newly created email <field type="TextField" name="variables">$email: Newly created email
$fullname: Fullname of the new person $fullname: Fullname of the new person
$person_id: Id of the new Person object $person_id: Id of the new Person object
$group: Name of the group</field> $group: Name of the group</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
<field type="TextField" name="content">Hello, <field type="TextField" name="content">Hello,
A new person with name $fullname and email $email has been created. The new Person object has the following id: '$person_id'. A new person with name $fullname and email $email has been created. The new Person object has the following id: '$person_id'.
Please, check if there is some more action nedeed.</field> Please, check if there is some more action nedeed.</field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="3" model="dbtemplate.dbtemplate"> <object pk="3" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/email/new_nominee.txt</field> <field type="CharField" name="path">/nomcom/defaults/email/new_nominee.txt</field>
<field type="CharField" name="title">Email sent to nominees when they are nominated</field> <field type="CharField" name="title">Email sent to nominees when they are nominated</field>
<field type="TextField" name="variables">$nominee: Full name of the nominee <field type="TextField" name="variables">$nominee: Full name of the nominee
$position: Name of the position $position: Name of the position
$domain: Server domain $domain: Server domain
$accept_url: Url hash to accept nominations $accept_url: Url hash to accept nominations
$decline_url: Url hash to decline nominations</field> $decline_url: Url hash to decline nominations</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
<field type="TextField" name="content">Hi, <field type="TextField" name="content">Hi,
You have been nominated for the position of $position. You have been nominated for the position of $position.
The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position. The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position.
You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url
If you accept, you will need to fill out a questionnaire. You will receive the questionnaire by email. If you accept, you will need to fill out a questionnaire. You will receive the questionnaire by email.
Best regards, Best regards,
</field> </field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="4" model="dbtemplate.dbtemplate"> <object pk="4" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/email/new_nomination.txt</field> <field type="CharField" name="path">/nomcom/defaults/email/new_nomination.txt</field>
<field type="CharField" name="title">Email sent to nominators and secretariat when the nominators make the nominations</field> <field type="CharField" name="title">Email sent to nominators and secretariat when the nominators make the nominations</field>
<field type="TextField" name="variables">$nominator: Full name of the nominator <field type="TextField" name="variables">$nominator: Full name of the nominator
$nominator_email: Email of the nominator $nominator_email: Email of the nominator
$nominee: Full name of the nominee $nominee: Full name of the nominee
$nominee_email: Email of the nominee $nominee_email: Email of the nominee
$position: Nomination position</field> $position: Nomination position</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
<field type="TextField" name="content">A new nomination have been received. <field type="TextField" name="content">A new nomination have been received.
Nominator: $nominator ($nominator_email) Nominator: $nominator ($nominator_email)
Nominee: $nominee ($nominee_email) Nominee: $nominee ($nominee_email)
Position: $position</field> Position: $position</field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="5" model="dbtemplate.dbtemplate"> <object pk="5" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/position/questionnaire.txt</field> <field type="CharField" name="path">/nomcom/defaults/position/questionnaire.txt</field>
<field type="CharField" name="title">Questionnaire sent to the nomine</field> <field type="CharField" name="title">Questionnaire sent to the nomine</field>
<field type="TextField" name="variables">$position: Position</field> <field type="TextField" name="variables">$position: Position</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
<field type="TextField" name="content">Enter here the questionnaire for the position $position: <field type="TextField" name="content">Enter here the questionnaire for the position $position:
Questionnaire</field> Questionnaire</field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="6" model="dbtemplate.dbtemplate"> <object pk="6" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/position/requirements</field> <field type="CharField" name="path">/nomcom/defaults/position/requirements</field>
<field type="CharField" name="title">Position requirements</field> <field type="CharField" name="title">Position requirements</field>
<field type="TextField" name="variables">$position: Position</field> <field type="TextField" name="variables">$position: Position</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
<field type="TextField" name="content">These are the requirements for the position $position: <field type="TextField" name="content">These are the requirements for the position $position:
Requirements.</field> Requirements.</field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="7" model="dbtemplate.dbtemplate"> <object pk="7" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/position/header_questionnaire.txt</field> <field type="CharField" name="path">/nomcom/defaults/position/header_questionnaire.txt</field>
<field type="CharField" name="title">Header of the email that contains the questionnaire sent to the nomine</field> <field type="CharField" name="title">Header of the email that contains the questionnaire sent to the nomine</field>
<field type="TextField" name="variables">$nominee: Full name of the nomine <field type="TextField" name="variables">$nominee: Full name of the nomine
$position: Position</field> $position: Position</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
<field type="TextField" name="content">Hi $nominee, this is the questionnaire for the position $position: <field type="TextField" name="content">Hi $nominee, this is the questionnaire for the position $position:
</field> </field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="8" model="dbtemplate.dbtemplate"> <object pk="8" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/email/nomination_accept_reminder.txt</field> <field type="CharField" name="path">/nomcom/defaults/email/nomination_accept_reminder.txt</field>
<field type="CharField" name="title">Email sent to nominees asking them to accept (or decline) the nominations.</field> <field type="CharField" name="title">Email sent to nominees asking them to accept (or decline) the nominations.</field>
<field type="TextField" name="variables">$positions: Nomination positions</field> <field type="TextField" name="variables">$positions: Nomination positions</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
<field type="TextField" name="content">Hi, <field type="TextField" name="content">Hi,
You have been nominated for the position of $position. You have been nominated for the position of $position.
The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position. The NomCom would appreciate receiving an indication of whether or not you accept this nomination to stand for consideration as a candidate for this position.
You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url You can accept the nomination via web going to the following link https://$domain$accept_url or decline the nomination going the following link https://$domain$decline_url
If you accept, you will need to fill out a questionnaire. If you accept, you will need to fill out a questionnaire.
Best regards,</field> Best regards,</field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="9" model="dbtemplate.dbtemplate"> <object pk="9" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/email/nomination_receipt.txt</field> <field type="CharField" name="path">/nomcom/defaults/email/nomination_receipt.txt</field>
<field type="CharField" name="title">Email sent to nominator to get a confirmation mail containing feedback in cleartext</field> <field type="CharField" name="title">Email sent to nominator to get a confirmation mail containing feedback in cleartext</field>
<field type="TextField" name="variables">$nominee: Full name of the nominee <field type="TextField" name="variables">$nominee: Full name of the nominee
$position: Name of the position $position: Name of the position
$domain: Server domain $domain: Server domain
$accept_url: Url hash to accept nominations $accept_url: Url hash to accept nominations
$decline_url: Url hash to decline nominations</field> $decline_url: Url hash to decline nominations</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
<field type="TextField" name="content">Hi, <field type="TextField" name="content">Hi,
Your nomination of $nominee for the position of Your nomination of $nominee for the position of
$position has been received and registered. $position has been received and registered.
The following comments have also been registered: The following comments have also been registered:
-------------------------------------------------------------------------- --------------------------------------------------------------------------
$comments $comments
-------------------------------------------------------------------------- --------------------------------------------------------------------------
Thank you,</field> Thank you,</field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="10" model="dbtemplate.dbtemplate"> <object pk="10" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/email/feedback_receipt.txt</field> <field type="CharField" name="path">/nomcom/defaults/email/feedback_receipt.txt</field>
<field type="CharField" name="title">Email sent to feedback author to get a confirmation mail containing feedback in cleartext</field> <field type="CharField" name="title">Email sent to feedback author to get a confirmation mail containing feedback in cleartext</field>
<field type="TextField" name="variables">$nominee: Full name of the nominee <field type="TextField" name="variables">$nominee: Full name of the nominee
$position: Nomination position $position: Nomination position
$comments: Comments on this candidate</field> $comments: Comments on this candidate</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
<field type="TextField" name="content">Hi, <field type="TextField" name="content">Hi,
Your input regarding $about has been received and registered. Your input regarding $about has been received and registered.
The following comments have been registered: The following comments have been registered:
-------------------------------------------------------------------------- --------------------------------------------------------------------------
$comments $comments
-------------------------------------------------------------------------- --------------------------------------------------------------------------
Thank you,</field> Thank you,</field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="11" model="dbtemplate.dbtemplate"> <object pk="11" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/email/questionnaire_reminder.txt</field> <field type="CharField" name="path">/nomcom/defaults/email/questionnaire_reminder.txt</field>
<field type="CharField" name="title">Email sent to nominees reminding them to complete a questionnaire</field> <field type="CharField" name="title">Email sent to nominees reminding them to complete a questionnaire</field>
<field type="TextField" name="variables">$positions: Nomination positions</field> <field type="TextField" name="variables">$positions: Nomination positions</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">plain</field>
<field type="TextField" name="content"> <field type="TextField" name="content">
Thank you for accepting your nomination for the position of $position. Thank you for accepting your nomination for the position of $position.
Please remember to complete and return the questionnaire for this position at your earliest opportunity. Please remember to complete and return the questionnaire for this position at your earliest opportunity.
The questionnaire is repeated below for your convenience. The questionnaire is repeated below for your convenience.
--------</field> --------</field>
<field to="group.group" name="group" rel="ManyToOneRel"><None></None></field> <field to="group.group" name="group" rel="ManyToOneRel"><None></None></field>
</object> </object>
<object pk="12" model="dbtemplate.dbtemplate"> <object pk="12" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/topic/description</field> <field type="CharField" name="path">/nomcom/defaults/topic/description</field>
<field type="CharField" name="title">Description of Topic</field> <field type="CharField" name="title">Description of Topic</field>
<field type="TextField" name="variables">$topic: Topic'</field> <field type="TextField" name="variables">$topic: Topic'</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
<field type="TextField" name="content">This is a description of the topic "$topic" <field type="TextField" name="content">This is a description of the topic "$topic"
Describe the topic and add any information/instructions for the responder here. Describe the topic and add any information/instructions for the responder here.
</field> </field>
</object> </object>
<object pk="13" model="dbtemplate.dbtemplate"> <object pk="13" model="dbtemplate.dbtemplate">
<field type="CharField" name="path">/nomcom/defaults/iesg_requirements</field> <field type="CharField" name="path">/nomcom/defaults/iesg_requirements</field>
<field type="CharField" name="title">Generic IESG Requirements</field> <field type="CharField" name="title">Generic IESG Requirements</field>
<field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field> <field to="name.dbtemplatetypename" name="type" rel="ManyToOneRel">rst</field>
<field type="TextField" name="content">Generic IESG Requirements Yo!</field> <field type="TextField" name="content">Generic IESG Requirements Yo!</field>
</object> </object>
</django-objects> </django-objects>

142
ietf/secr/static/js/dynamic_inlines.js
View file

@ -1,71 +1,71 @@
/* Following functions based off code written by Arne Brodowski /* Following functions based off code written by Arne Brodowski
http://www.arnebrodowski.de/blog/507-Add-and-remove-Django-Admin-Inlines-with-JavaScript.html http://www.arnebrodowski.de/blog/507-Add-and-remove-Django-Admin-Inlines-with-JavaScript.html
2012-02-01 customized for new Rolodex. Email formset doesn't have an id field, rather a "address" 2012-02-01 customized for new Rolodex. Email formset doesn't have an id field, rather a "address"
field as primary key. Also for some reason the "active" boolean field doesn't get saved properly field as primary key. Also for some reason the "active" boolean field doesn't get saved properly
if the checkbox input has an empty "value" argument. if the checkbox input has an empty "value" argument.
*/ */
import $ from 'jquery'; import $ from 'jquery';
function increment_form_ids(el, to, name) { function increment_form_ids(el, to, name) {
var from = to-1 var from = to-1
$(':input', $(el)).each(function(i,e){ $(':input', $(el)).each(function(i,e){
var old_name = $(e).attr('name') var old_name = $(e).attr('name')
var old_id = $(e).attr('id') var old_id = $(e).attr('id')
$(e).attr('name', old_name.replace(from, to)) $(e).attr('name', old_name.replace(from, to))
$(e).attr('id', old_id.replace(from, to)) $(e).attr('id', old_id.replace(from, to))
if ($(e).attr('type') != 'checkbox') { if ($(e).attr('type') != 'checkbox') {
$(e).val('') $(e).val('')
} }
}) })
} }
function add_inline_form(name) { function add_inline_form(name) {
if (name=="email") { if (name=="email") {
var first = $('#id_'+name+'-0-address').parents('.inline-related') var first = $('#id_'+name+'-0-address').parents('.inline-related')
} }
else { else {
var first = $('#id_'+name+'-0-id').parents('.inline-related') var first = $('#id_'+name+'-0-id').parents('.inline-related')
} }
// check to see if this is a stacked or tabular inline // check to see if this is a stacked or tabular inline
if (first.hasClass("tabular")) { if (first.hasClass("tabular")) {
var field_table = first.parent().find('table > tbody') var field_table = first.parent().find('table > tbody')
const children = field_table.children('tr.dynamic-inline') const children = field_table.children('tr.dynamic-inline')
var count = children.length var count = children.length
const last = $(children[count-1]) const last = $(children[count-1])
var copy = last.clone(true) var copy = last.clone(true)
copy.removeClass("row1 row2") copy.removeClass("row1 row2")
copy.find("input[name$='address']").attr("readonly", false) copy.find("input[name$='address']").attr("readonly", false)
copy.addClass("row"+((count % 2) ? 2 : 1)) copy.addClass("row"+((count % 2) ? 2 : 1))
copy.insertAfter(last) copy.insertAfter(last)
increment_form_ids($(copy), count, name) increment_form_ids($(copy), count, name)
} }
else { else {
var last = $(first).parent().children('.last-related') var last = $(first).parent().children('.last-related')
var copy = $(last).clone(true) var copy = $(last).clone(true)
var count = $(first).parent().children('.inline-related').length var count = $(first).parent().children('.inline-related').length
$(last).removeClass('last-related') $(last).removeClass('last-related')
var header = $('h3', copy) var header = $('h3', copy)
header.html(header.html().replace("#"+count, "#"+(count+1))) header.html(header.html().replace("#"+count, "#"+(count+1)))
$(last).after(copy) $(last).after(copy)
increment_form_ids($(first).parents('.inline-group').children('.last-related'), count, name) increment_form_ids($(first).parents('.inline-group').children('.last-related'), count, name)
} }
$('input#id_'+name+'-TOTAL_FORMS').val(count+1) $('input#id_'+name+'-TOTAL_FORMS').val(count+1)
return false; return false;
} }
// Add all the "Add Another" links to the bottom of each inline group // Add all the "Add Another" links to the bottom of each inline group
$(function() { $(function() {
var html_template = '<ul class="tools">'+ var html_template = '<ul class="tools">'+
'<li>'+ '<li>'+
'<a id="addlink-{{prefix}}" class="addlink" href="#">'+ '<a id="addlink-{{prefix}}" class="addlink" href="#">'+
'Add another</a>'+ 'Add another</a>'+
'</li>'+ '</li>'+
'</ul>' '</ul>'
$('.inline-group').each(function(i) { $('.inline-group').each(function(i) {
//prefix is in the name of the input fields before the "-" //prefix is in the name of the input fields before the "-"
var prefix = $("input[type='hidden'][name!='csrfmiddlewaretoken']", this).attr("name").split("-")[0]; var prefix = $("input[type='hidden'][name!='csrfmiddlewaretoken']", this).attr("name").split("-")[0];
$(this).append(html_template.replace("{{prefix}}", prefix)); $(this).append(html_template.replace("{{prefix}}", prefix));
$('#addlink-' + prefix).on('click', () => add_inline_form(prefix)); $('#addlink-' + prefix).on('click', () => add_inline_form(prefix));
}) })
}) })

8
k8s/README.md
View file

@ -1,5 +1,5 @@
# Kustomize deployment # Kustomize deployment
## Run locally ## Run locally
The `secrets.yaml` file is provided as a reference only and must be referenced manually in the `kustomization.yaml` file. The `secrets.yaml` file is provided as a reference only and must be referenced manually in the `kustomization.yaml` file.

32
k8s/kustomization.yaml
View file

@ -1,16 +1,16 @@
namespace: datatracker namespace: datatracker
namePrefix: dt- namePrefix: dt-
configMapGenerator: configMapGenerator:
- name: files-cfgmap - name: files-cfgmap
files: files:
- nginx-logging.conf - nginx-logging.conf
- nginx-auth.conf - nginx-auth.conf
- nginx-datatracker.conf - nginx-datatracker.conf
- settings_local.py - settings_local.py
resources: resources:
- auth.yaml - auth.yaml
- beat.yaml - beat.yaml
- celery.yaml - celery.yaml
- datatracker.yaml - datatracker.yaml
- memcached.yaml - memcached.yaml
- rabbitmq.yaml - rabbitmq.yaml

160
k8s/memcached.yaml
View file

@ -1,80 +1,80 @@
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: memcached name: memcached
spec: spec:
replicas: 1 replicas: 1
revisionHistoryLimit: 2 revisionHistoryLimit: 2
selector: selector:
matchLabels: matchLabels:
app: memcached app: memcached
template: template:
metadata: metadata:
labels: labels:
app: memcached app: memcached
spec: spec:
securityContext: securityContext:
runAsNonRoot: true runAsNonRoot: true
containers: containers:
# ----------------------------------------------------- # -----------------------------------------------------
# Memcached # Memcached
# ----------------------------------------------------- # -----------------------------------------------------
- image: "memcached:1.6-alpine" - image: "memcached:1.6-alpine"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
args: ["-m", "1024"] args: ["-m", "1024"]
name: memcached name: memcached
ports: ports:
- name: memcached - name: memcached
containerPort: 11211 containerPort: 11211
protocol: TCP protocol: TCP
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities: capabilities:
drop: drop:
- ALL - ALL
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
# memcached image sets up uid/gid 11211 # memcached image sets up uid/gid 11211
runAsUser: 11211 runAsUser: 11211
runAsGroup: 11211 runAsGroup: 11211
# ----------------------------------------------------- # -----------------------------------------------------
# Memcached Exporter for Prometheus # Memcached Exporter for Prometheus
# ----------------------------------------------------- # -----------------------------------------------------
- image: "quay.io/prometheus/memcached-exporter:v0.14.3" - image: "quay.io/prometheus/memcached-exporter:v0.14.3"
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: memcached-exporter name: memcached-exporter
ports: ports:
- name: metrics - name: metrics
containerPort: 9150 containerPort: 9150
protocol: TCP protocol: TCP
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities: capabilities:
drop: drop:
- ALL - ALL
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
runAsUser: 65534 # nobody runAsUser: 65534 # nobody
runAsGroup: 65534 # nobody runAsGroup: 65534 # nobody
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
restartPolicy: Always restartPolicy: Always
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: memcached name: memcached
annotations: annotations:
k8s.grafana.com/scrape: "true" # this is not a bool k8s.grafana.com/scrape: "true" # this is not a bool
k8s.grafana.com/metrics.portName: "metrics" k8s.grafana.com/metrics.portName: "metrics"
spec: spec:
type: ClusterIP type: ClusterIP
ports: ports:
- port: 11211 - port: 11211
targetPort: memcached targetPort: memcached
protocol: TCP protocol: TCP
name: memcached name: memcached
- port: 9150 - port: 9150
targetPort: metrics targetPort: metrics
protocol: TCP protocol: TCP
name: metrics name: metrics
selector: selector:
app: memcached app: memcached

164
k8s/secrets.yaml
View file

@ -1,83 +1,83 @@
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: secrets-env name: secrets-env
type: Opaque type: Opaque
stringData: stringData:
DATATRACKER_SERVER_MODE: "development" # development for staging, production for production DATATRACKER_SERVER_MODE: "development" # development for staging, production for production
DATATRACKER_ADMINS: |- DATATRACKER_ADMINS: |-
Robert Sparks <rjsparks@nostrum.com> Robert Sparks <rjsparks@nostrum.com>
Ryan Cross <rcross@amsl.com> Ryan Cross <rcross@amsl.com>
Kesara Rathnayake <kesara@staff.ietf.org> Kesara Rathnayake <kesara@staff.ietf.org>
Jennifer Richards <jennifer@staff.ietf.org> Jennifer Richards <jennifer@staff.ietf.org>
Nicolas Giard <nick@staff.ietf.org> Nicolas Giard <nick@staff.ietf.org>
DATATRACKER_ALLOWED_HOSTS: ".ietf.org" # newline-separated list also allowed DATATRACKER_ALLOWED_HOSTS: ".ietf.org" # newline-separated list also allowed
# DATATRACKER_DATATRACKER_DEBUG: "false" # DATATRACKER_DATATRACKER_DEBUG: "false"
# DB access details - needs to be filled in # DB access details - needs to be filled in
# DATATRACKER_DB_HOST: "db" # DATATRACKER_DB_HOST: "db"
# DATATRACKER_DB_PORT: "5432" # DATATRACKER_DB_PORT: "5432"
# DATATRACKER_DB_NAME: "datatracker" # DATATRACKER_DB_NAME: "datatracker"
# DATATRACKER_DB_USER: "django" # secret # DATATRACKER_DB_USER: "django" # secret
# DATATRACKER_DB_PASS: "RkTkDPFnKpko" # secret # DATATRACKER_DB_PASS: "RkTkDPFnKpko" # secret
# DATATRACKER_DB_CONN_MAX_AGE: "0" # connection per request if not set, no limit if set to "None" # DATATRACKER_DB_CONN_MAX_AGE: "0" # connection per request if not set, no limit if set to "None"
# DATATRACKER_DB_CONN_HEALTH_CHECKS: "false" # DATATRACKER_DB_CONN_HEALTH_CHECKS: "false"
DATATRACKER_DJANGO_SECRET_KEY: "PDwXboUq!=hPjnrtG2=ge#N$Dwy+wn@uivrugwpic8mxyPfHk" # secret DATATRACKER_DJANGO_SECRET_KEY: "PDwXboUq!=hPjnrtG2=ge#N$Dwy+wn@uivrugwpic8mxyPfHk" # secret
# Set this to point testing / staging at the production statics server until we # Set this to point testing / staging at the production statics server until we
# sort that out # sort that out
# DATATRACKER_STATIC_URL: "https://static.ietf.org/dt/12.10.0/" # DATATRACKER_STATIC_URL: "https://static.ietf.org/dt/12.10.0/"
# DATATRACKER_EMAIL_DEBUG: "true" # DATATRACKER_EMAIL_DEBUG: "true"
# Outgoing email details # Outgoing email details
# DATATRACKER_EMAIL_HOST: "localhost" # defaults to localhost # DATATRACKER_EMAIL_HOST: "localhost" # defaults to localhost
# DATATRACKER_EMAIL_PORT: "2025" # defaults to 2025 # DATATRACKER_EMAIL_PORT: "2025" # defaults to 2025
# The value here is the default from settings.py (i.e., not actually secret) # The value here is the default from settings.py (i.e., not actually secret)
DATATRACKER_NOMCOM_APP_SECRET_B64: "m9pzMezVoFNJfsvU9XSZxGnXnwup6P5ZgCQeEnROOoQ=" # secret DATATRACKER_NOMCOM_APP_SECRET_B64: "m9pzMezVoFNJfsvU9XSZxGnXnwup6P5ZgCQeEnROOoQ=" # secret
DATATRACKER_IANA_SYNC_PASSWORD: "this-is-the-iana-sync-password" # secret DATATRACKER_IANA_SYNC_PASSWORD: "this-is-the-iana-sync-password" # secret
DATATRACKER_RFC_EDITOR_SYNC_PASSWORD: "this-is-the-rfc-editor-sync-password" # secret DATATRACKER_RFC_EDITOR_SYNC_PASSWORD: "this-is-the-rfc-editor-sync-password" # secret
DATATRACKER_YOUTUBE_API_KEY: "this-is-the-youtube-api-key" # secret DATATRACKER_YOUTUBE_API_KEY: "this-is-the-youtube-api-key" # secret
DATATRACKER_GITHUB_BACKUP_API_KEY: "this-is-the-github-backup-api-key" # secret DATATRACKER_GITHUB_BACKUP_API_KEY: "this-is-the-github-backup-api-key" # secret
# API key configuration # API key configuration
DATATRACKER_API_KEY_TYPE: "ES265" DATATRACKER_API_KEY_TYPE: "ES265"
# secret - value here is the default from settings.py (i.e., not actually secret) # secret - value here is the default from settings.py (i.e., not actually secret)
DATATRACKER_API_PUBLIC_KEY_PEM_B64: |- DATATRACKER_API_PUBLIC_KEY_PEM_B64: |-
Ci0tLS0tQkVHSU4gUFVCTElDIEtFWS0tLS0tCk1Ga3dFd1lIS29aSXpqMENBUVlJS Ci0tLS0tQkVHSU4gUFVCTElDIEtFWS0tLS0tCk1Ga3dFd1lIS29aSXpqMENBUVlJS
29aSXpqMERBUWNEUWdBRXFWb2pzYW9mREpTY3VNSk4rdHNodW15Tk01TUUKZ2Fyel 29aSXpqMERBUWNEUWdBRXFWb2pzYW9mREpTY3VNSk4rdHNodW15Tk01TUUKZ2Fyel
ZQcWtWb3ZtRjZ5RTdJSi9kdjRGY1YrUUtDdEovck9TOGUzNlk4WkFFVll1dWtoZXM ZQcWtWb3ZtRjZ5RTdJSi9kdjRGY1YrUUtDdEovck9TOGUzNlk4WkFFVll1dWtoZXM
weVoxdz09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo= weVoxdz09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=
# secret - value here is the default from settings.py (i.e., not actually secret) # secret - value here is the default from settings.py (i.e., not actually secret)
DATATRACKER_API_PRIVATE_KEY_PEM_B64: |- DATATRACKER_API_PRIVATE_KEY_PEM_B64: |-
Ci0tLS0tQkVHSU4gUFJJVkFURSBLRVktLS0tLQpNSUdIQWdFQU1CTUdCeXFHU000O Ci0tLS0tQkVHSU4gUFJJVkFURSBLRVktLS0tLQpNSUdIQWdFQU1CTUdCeXFHU000O
UFnRUdDQ3FHU000OUF3RUhCRzB3YXdJQkFRUWdvSTZMSmtvcEtxOFhySGk5ClFxR1 UFnRUdDQ3FHU000OUF3RUhCRzB3YXdJQkFRUWdvSTZMSmtvcEtxOFhySGk5ClFxR1
F2RTRBODNURllqcUx6KzhnVUxZZWNzcWhSQU5DQUFTcFdpT3hxaDhNbEp5NHdrMzY F2RTRBODNURllqcUx6KzhnVUxZZWNzcWhSQU5DQUFTcFdpT3hxaDhNbEp5NHdrMzY
yeUc2Ykkwemt3U0IKcXZOVStxUldpK1lYcklUc2duOTIvZ1Z4WDVBb0swbitzNUx4 yeUc2Ykkwemt3U0IKcXZOVStxUldpK1lYcklUc2duOTIvZ1Z4WDVBb0swbitzNUx4
N2ZwanhrQVJWaTY2U0Y2elRKblgKLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo= N2ZwanhrQVJWaTY2U0Y2elRKblgKLS0tLS1FTkQgUFJJVkFURSBLRVktLS0tLQo=
#DATATRACKER_REGISTRATION_API_KEY: "some-key" # secret" #DATATRACKER_REGISTRATION_API_KEY: "some-key" # secret"
# DATATRACKER_MEETECHO_API_BASE: "https://meetings.conf.meetecho.com/api/v1/" # DATATRACKER_MEETECHO_API_BASE: "https://meetings.conf.meetecho.com/api/v1/"
DATATRACKER_MEETECHO_CLIENT_ID: "this-is-the-meetecho-client-id" # secret DATATRACKER_MEETECHO_CLIENT_ID: "this-is-the-meetecho-client-id" # secret
DATATRACKER_MEETECHO_CLIENT_SECRET: "this-is-the-meetecho-client-secret" # secret DATATRACKER_MEETECHO_CLIENT_SECRET: "this-is-the-meetecho-client-secret" # secret
# DATATRACKER_MATOMO_SITE_ID: "7" # must be present to enable Matomo # DATATRACKER_MATOMO_SITE_ID: "7" # must be present to enable Matomo
# DATATRACKER_MATOMO_DOMAIN_PATH: "analytics.ietf.org" # DATATRACKER_MATOMO_DOMAIN_PATH: "analytics.ietf.org"
CELERY_PASSWORD: "this-is-a-secret" # secret CELERY_PASSWORD: "this-is-a-secret" # secret
# Only one of these may be set # Only one of these may be set
# DATATRACKER_APP_API_TOKENS_JSON_B64: "e30K" # secret # DATATRACKER_APP_API_TOKENS_JSON_B64: "e30K" # secret
# DATATRACKER_APP_API_TOKENS_JSON: "{}" # secret # DATATRACKER_APP_API_TOKENS_JSON: "{}" # secret
# use this to override default - one entry per line # use this to override default - one entry per line
# DATATRACKER_CSRF_TRUSTED_ORIGINS: |- # DATATRACKER_CSRF_TRUSTED_ORIGINS: |-
# https://datatracker.staging.ietf.org # https://datatracker.staging.ietf.org
# Scout configuration # Scout configuration
DATATRACKER_SCOUT_KEY: "this-is-the-scout-key" DATATRACKER_SCOUT_KEY: "this-is-the-scout-key"
DATATRACKER_SCOUT_NAME: "StagingDatatracker" DATATRACKER_SCOUT_NAME: "StagingDatatracker"