Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
infrastructure
Commits
7bdf553d
Commit
7bdf553d
authored
Dec 28, 2020
by
Frederik Schwan
Browse files
Merge branch 'cleanup-masterkey-and-www' into 'master'
make master-key and www CNAME entries See merge request
!242
parents
8a8c7b30
9a2ae489
Pipeline
#4176
passed with stage
in 40 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
tf-stage1/archlinux.tf
View file @
7bdf553d
...
...
@@ -190,10 +190,6 @@ locals {
ipv4_address
=
"5.9.250.164"
ipv6_address
=
"2a01:4f8:160:3033::2"
}
master
-
key
=
{
ipv4_address
=
hcloud_server
.
machine
[
"archlinux.org"
].
ipv4_address
ipv6_address
=
hcloud_server
.
machine
[
"archlinux.org"
].
ipv6_address
}
pages
=
{
ipv4_address
=
hcloud_floating_ip
.
gitlab_pages
.
ip_address
ipv6_address
=
var
.
gitlab_pages_ipv6
...
...
@@ -214,10 +210,6 @@ locals {
ipv4_address
=
"116.203.16.252"
ipv6_address
=
"2a01:4f8:c2c:474::1"
}
www
=
{
ipv4_address
=
hcloud_server
.
machine
[
"archlinux.org"
].
ipv4_address
ipv6_address
=
hcloud_server
.
machine
[
"archlinux.org"
].
ipv6_address
}
}
# This creates archlinux.org CNAME DNS entries.
...
...
@@ -229,16 +221,17 @@ locals {
# dev = { value = "www", ttl = 600 }
archlinux_org_cname
=
{
archive
=
{
value
=
"gemini"
}
dev
=
{
value
=
"
www
"
}
dev
=
{
value
=
"
@
"
}
g2kjxsblac7x
=
{
value
=
"gv-i5y6mnrelvpfiu.dv.googlehosted.com."
}
git
=
{
value
=
"luna"
}
grafana
=
{
value
=
"apollo"
}
ipxe
=
{
value
=
"
www
"
}
ipxe
=
{
value
=
"
@
"
}
"luna2._domainkey.aur"
=
{
value
=
"luna2._domainkey"
}
"luna2._domainkey.lists"
=
{
value
=
"luna2._domainkey"
}
mailman
=
{
value
=
"apollo"
}
packages
=
{
value
=
"www"
}
planet
=
{
value
=
"www"
}
master
-
key
=
{
value
=
"@"
}
packages
=
{
value
=
"@"
}
planet
=
{
value
=
"@"
}
projects
=
{
value
=
"luna"
}
repos
=
{
value
=
"gemini"
}
rsync
=
{
value
=
"gemini"
}
...
...
@@ -247,6 +240,7 @@ locals {
static
=
{
value
=
"apollo"
}
status
=
{
value
=
"stats.uptimerobot.com."
}
svn
=
{
value
=
"gemini"
}
www
=
{
value
=
"@"
}
}
# This creates pkgbuild.comA/AAAA DNS entries in addition to those already specified by the VPSes.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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