Skip to content

Commit f10aa5c

Browse files
committed
Merge branch 'main' into slides-upload
2 parents 51e45c4 + d07501c commit f10aa5c

File tree

6 files changed

+34
-4
lines changed

6 files changed

+34
-4
lines changed

infrastructure/applications/database/db.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resource "aws_db_instance" "database" {
99
engine = "postgres"
1010
identifier = "pythonit-${terraform.workspace}"
1111
allow_major_version_upgrade = true
12-
engine_version = "14.13"
12+
engine_version = "14.17"
1313
instance_class = "db.t4g.micro"
1414
db_name = local.is_prod ? "${local.normalized_workspace}backend" : "pycon"
1515
username = "root"

infrastructure/applications/pretix/main.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,14 @@ resource "aws_ecs_task_definition" "pretix" {
154154
{
155155
name = "AWS_S3_REGION_NAME",
156156
value = "eu-central-1"
157+
},
158+
{
159+
name = "AWS_REQUEST_CHECKSUM_CALCULATION",
160+
value = "WHEN_REQUIRED"
161+
},
162+
{
163+
name = "AWS_RESPONSE_CHECKSUM_VALIDATION",
164+
value = "WHEN_REQUIRED"
157165
}
158166
]
159167
portMappings = [

infrastructure/applications/pretix/s3.tf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,14 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "media" {
1313
}
1414
}
1515
}
16+
17+
resource "aws_s3_bucket_cors_configuration" "cors" {
18+
bucket = aws_s3_bucket.media.id
19+
20+
cors_rule {
21+
allowed_methods = ["GET"]
22+
allowed_origins = [
23+
"https://${local.alias}"
24+
]
25+
}
26+
}

infrastructure/global/domains/python_it/records.tf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,14 @@ resource "aws_route53_record" "roma_python_it_cname" {
198198
ttl = "3600"
199199
}
200200

201+
resource "aws_route53_record" "pydataroma_python_it_cname" {
202+
zone_id = aws_route53_zone.pythonit.id
203+
name = "pydataroma.python.it"
204+
type = "CNAME"
205+
records = ["pydataromacapitale.github.io"]
206+
ttl = "3600"
207+
}
208+
201209
resource "aws_route53_record" "testcommunity_cname" {
202210
zone_id = aws_route53_zone.pythonit.id
203211
name = "testcommunity.python.it"

pretix/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM ghcr.io/pythonitalia/pycon/base-pretix:v2024.10.0
1+
FROM ghcr.io/pythonitalia/pycon/base-pretix:v2025.5.0
22

33
COPY ./settings.py /pretix/src/production_settings.py
44

5-
RUN pip install boto3==1.35.14 \
6-
django-storages==1.14.4 \
5+
RUN pip install boto3==1.38.36 \
6+
django-storages==1.14.6 \
77
pretix-plugin-extended-api==0.1.14 \
88
pretix-plugin-attendance-certificate==0.1.11 \
99
pretix-fattura-elettronica==0.2.16 \

pretix/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@
2323
}
2424

2525
AWS_STORAGE_BUCKET_NAME = config.get("pycon", "media_bucket_name", fallback="")
26+
AWS_S3_SIGNATURE_VERSION = "s3v4"
27+
AWS_S3_ADDRESSING_STYLE = "virtual"
28+
AWS_S3_REGION_NAME = "eu-central-1"

0 commit comments

Comments
 (0)