Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
infrastructure
Commits
b1220323
Verified
Commit
b1220323
authored
Dec 31, 2020
by
Frederik Schwan
Browse files
add fixes to minimize changes introduced by
!241
parent
d67842e7
Pipeline
#4297
passed with stage
in 42 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
tf-stage1/archlinux.tf
View file @
b1220323
...
...
@@ -170,13 +170,13 @@ locals {
"_smtp._tls.master-key"
=
{
value
=
"v=TLSRPTv1;rua=mailto:postmaster@archlinux.org"
}
"_smtp._tls.lists"
=
{
value
=
"v=TLSRPTv1;rua=mailto:postmaster@archlinux.org"
}
# Generated with: date +%s
"_mta-sts"
=
{
value
=
"v=STSv1; id=1608210175"
}
"_mta-sts"
=
{
ttl
=
600
,
value
=
"v=STSv1; id=1608210175"
}
"@"
=
{
value
=
"v=spf1 ip4:
${
hcloud_server
.
machine
[
"mail.archlinux.org"
].
ipv4_address
}
ip6:
${
hcloud_server
.
machine
[
"mail.archlinux.org"
].
ipv6_address
}
~all"
,
ttl
=
600
}
"mail"
=
{
value
=
"v=spf1 ip4:
${
hcloud_server
.
machine
[
"mail.archlinux.org"
].
ipv4_address
}
ip6:
${
hcloud_server
.
machine
[
"mail.archlinux.org"
].
ipv6_address
}
~all"
,
ttl
=
600
}
"aur"
=
{
value
=
"v=spf1 ip4:
${
hcloud_server
.
machine
[
"mail.archlinux.org"
].
ipv4_address
}
ip6:
${
hcloud_server
.
machine
[
"mail.archlinux.org"
].
ipv6_address
}
~all"
,
ttl
=
600
}
"master-key"
=
{
value
=
"v=spf1 ip4:
${
hcloud_server
.
machine
[
"mail.archlinux.org"
].
ipv4_address
}
ip6:
${
hcloud_server
.
machine
[
"mail.archlinux.org"
].
ipv6_address
}
~all"
,
ttl
=
600
}
lists
=
{
value
=
"v=spf1 ip4:5.9.250.164 ip6:2a01:4f8:160:3033::2 ~all"
}
luna
=
{
value
=
"v=spf1 ip4:5.9.250.164 ip6:2a01:4f8:160:3033::2 ~all"
}
lists
=
{
ttl
=
600
,
value
=
"v=spf1 ip4:5.9.250.164 ip6:2a01:4f8:160:3033::2 ~all"
}
luna
=
{
ttl
=
600
,
value
=
"v=spf1 ip4:5.9.250.164 ip6:2a01:4f8:160:3033::2 ~all"
}
}
# This creates archlinux.org MX DNS entries
...
...
@@ -290,11 +290,11 @@ locals {
# MTA-STS
mta
-
sts
=
{
value
=
"mail"
}
"mta-sts.aur"
=
{
value
=
"mail"
}
"_mta-sts.aur"
=
{
value
=
"_mta-sts"
}
"_mta-sts.aur"
=
{
value
=
"_mta-sts"
,
ttl
=
600
}
"mta-sts.master-key"
=
{
value
=
"mail"
}
"_mta-sts.master-key"
=
{
value
=
"_mta-sts"
}
"_mta-sts.master-key"
=
{
value
=
"_mta-sts"
,
ttl
=
600
}
"mta-sts.lists"
=
{
value
=
"mail"
}
"_mta-sts.lists"
=
{
value
=
"_mta-sts"
}
"_mta-sts.lists"
=
{
value
=
"_mta-sts"
,
ttl
=
600
}
}
# This creates pkgbuild.comA/AAAA DNS entries in addition to those already specified by the VPSes.
...
...
tf-stage1/templates.tf
View file @
b1220323
...
...
@@ -44,7 +44,7 @@ resource "hetznerdns_record" "archlinux_org_txt" {
zone_id
=
hetznerdns_zone
.
archlinux
.
id
name
=
each
.
key
ttl
=
lookup
(
local
.
archlinux_org_txt
[
each
.
key
],
"ttl"
,
null
)
value
=
"
\"
${
each
.
value
.
value
}
\"
"
value
=
"
\"
${
each
.
value
.
value
}
\"
"
type
=
"TXT"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment