Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assets/podman/caddy/Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ maps.guirao.net {
}

mail.guirao.net,
mta-sts.guirao.net,
autoconfig.guirao.net,
autodiscover.guirao.net {
reverse_proxy host.containers.internal:8080 {
Expand Down
6 changes: 3 additions & 3 deletions constructs/dns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export class DNS extends Construct {
});

new Route53Record(this, "dkim-ecc-record", {
name: "202509e._domainkey." + this.zone.name,
name: "202512e._domainkey." + this.zone.name,
zoneId: this.zone.zoneId,
type: "TXT",
ttl: 300,
Expand All @@ -116,7 +116,7 @@ export class DNS extends Construct {
});

new Route53Record(this, "dkim-rsa-record", {
name: "202509r._domainkey." + this.zone.name,
name: "202512e._domainkey." + this.zone.name,
zoneId: this.zone.zoneId,
type: "TXT",
ttl: 300,
Expand Down Expand Up @@ -194,7 +194,7 @@ export class DNS extends Construct {
zoneId: this.zone.zoneId,
type: "TXT",
ttl: 300,
records: ["v=STSv1; id=8777202045385525987"],
records: ["v=STSv1; id=20251219"],
});

new Route53Record(this, "txt-dmarc-record", {
Expand Down
30 changes: 19 additions & 11 deletions constructs/s3.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,33 @@ export class S3 extends Construct {
},
});

let lifecycleRules: S3BucketLifecycleConfigurationRule[] = [
{
id: "Trashcan",
status: "Enabled",
abortIncompleteMultipartUpload: [{ daysAfterInitiation: 7 }],
noncurrentVersionExpiration: [{ noncurrentDays: 90 }],
filter: [{ prefix: "" }],
},
];

let lifecycleRules: S3BucketLifecycleConfigurationRule[] = [];
if (name == "backups") {
lifecycleRules = lifecycleRules.concat([
{
id: "Backups",
status: "Enabled",
expiration: [{ days: 14 }],
expiration: [{ days: 30 }],
filter: [{ prefix: "stalwart/" }],
},
{
id: "Trashcan",
status: "Enabled",
abortIncompleteMultipartUpload: [{ daysAfterInitiation: 1 }],
noncurrentVersionExpiration: [{ noncurrentDays: 10 }],
filter: [{ prefix: "stalwart/" }],
},
]);
} else {
lifecycleRules = lifecycleRules.concat([
{
id: "Trashcan",
status: "Enabled",
abortIncompleteMultipartUpload: [{ daysAfterInitiation: 7 }],
noncurrentVersionExpiration: [{ noncurrentDays: 90 }],
filter: [{ prefix: "" }],
},
]);
}

new S3BucketLifecycleConfiguration(this, `${name}-lifecycle`, {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"devDependencies": {
"@types/jest": "^30",
"@types/node": "^24",
"@types/node": "^25",
"jest": "^30",
"ts-jest": "^29",
"ts-node": "^10",
Expand Down