aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'deployment')
-rw-r--r--deployment/common/manifests/default_ssh_root_key.pp1
-rw-r--r--deployment/dns/templates/mageia.org.zone5
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp5
3 files changed, 8 insertions, 3 deletions
diff --git a/deployment/common/manifests/default_ssh_root_key.pp b/deployment/common/manifests/default_ssh_root_key.pp
index b2d55a7c..ab17466d 100644
--- a/deployment/common/manifests/default_ssh_root_key.pp
+++ b/deployment/common/manifests/default_ssh_root_key.pp
@@ -69,6 +69,7 @@ class common::default_ssh_root_key {
}
ssh_authorized_key { 'ssh_key_neoclust':
+ ensure => 'absent',
type => 'ssh-rsa',
key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDGyI8oIP8SgahPbMZ04Msr/vnI2gf4yx//QhEnZv8b++WIH0oibfK8g5Lz4HXReJRHzNXN1EhKQXoClgAKwv7zqkTLxV44tVcz8cwvfldkKNB+QxfL74JgsxCyNW8mpJdrJ71kbkT4Jt6AxeEd10ltQyqT7QDQMM7fxH8dbOCMcc7jtgOqwPXLy7hEumqkYxNuMxjrAbiDk2Nx0ddP2Ta4NJjSsGzUzSPsGhLVCO3+Wv6Ymss9Vacbe684ERwqz6odi5ZX0utfXXNphqqAckKCxurrI+LoWzt9MgWtR9iJC1joVDqRbggNm6bNNPZIdhmi5/yJrk3x7qwXb7uQNiE7',
}
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone
index 2a21bc5f..cf3c7069 100644
--- a/deployment/dns/templates/mageia.org.zone
+++ b/deployment/dns/templates/mageia.org.zone
@@ -7,7 +7,7 @@
; $Id$
$TTL 30m
@ IN SOA ns0.mageia.org. root.mageia.org. (
- 2025021002 ; Serial
+ 2025062701 ; Serial
7200 ; Refresh
3600 ; Retry
3600000 ; Expire
@@ -166,5 +166,8 @@ ociaa1-c IN CNAME ociaa1
ociaa2-a IN CNAME ociaa2
ociaa2-b IN CNAME ociaa2
ociaa2-c IN CNAME ociaa2
+ncaa1-a IN CNAME ncaa1
+ncaa1-b IN CNAME ncaa1
+ncaa1-c IN CNAME ncaa1
<%# vim: set filetype=bindzone : -%>
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 7d2e5ebb..2aeb6750 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -29,8 +29,8 @@ class mga_buildsystem::config {
'i586' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'rabbit2' ],
'i686' => [ 'ecosse0', 'rabbit0', 'ecosse1', 'rabbit1', 'rabbit2' ],
'x86_64' => [ 'rabbit0', 'ecosse0', 'rabbit1', 'ecosse1', 'rabbit2' ],
- 'armv7hl' => [ 'ociaa1-a', 'ociaa1-b'],
- 'aarch64' => [ 'ociaa1-a', 'ociaa1-b'],
+ 'armv7hl' => [ 'ncaa1-a', 'ncaa1-b', 'ncaa1-c', 'ociaa1-a', 'ociaa1-b'],
+ 'aarch64' => [ 'ncaa1-a', 'ncaa1-b', 'ncaa1-c', 'ociaa1-a', 'ociaa1-b'],
},
build_nodes_aliases => {
'ecosse0' => "ecosse.${::domain}",
@@ -173,6 +173,7 @@ class mga_buildsystem::config {
'2001:bc8:628:1f00::1',
# Oracle cloud VMs
'2603:c026:c101:f00::/64',
+ $::nodes_ipaddr[ncaa1][ipv4],
]
$repo_allow_from_domains = [
".${::domain}",