aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Fandrich <danf@mageia.org>2024-10-30 20:25:52 -0700
committerDan Fandrich <danf@mageia.org>2024-10-31 12:54:57 -0700
commit9869c85a78dbc4491cda213ec89c33695126c8de (patch)
tree7a46580fb9cfb728eeddaa39db104c93904dac52
parent6c1f759eaa6d98ec8fa50b836712cad2d45dc261 (diff)
downloadpuppet-9869c85a78dbc4491cda213ec89c33695126c8de.tar
puppet-9869c85a78dbc4491cda213ec89c33695126c8de.tar.gz
puppet-9869c85a78dbc4491cda213ec89c33695126c8de.tar.bz2
puppet-9869c85a78dbc4491cda213ec89c33695126c8de.tar.xz
puppet-9869c85a78dbc4491cda213ec89c33695126c8de.zip
Temporarily redirect madb.mageia.org to a blog post
madb has gone down permanently but the replacement isn't ready yet.
-rw-r--r--deployment/dns/templates/mageia.org.zone6
-rw-r--r--manifests/nodes/neru.pp10
2 files changed, 14 insertions, 2 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone
index ce5d5202..a7346797 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. (
- 2024103001 ; Serial
+ 2024103101 ; Serial
7200 ; Refresh
3600 ; Retry
3600000 ; Expire
@@ -78,7 +78,9 @@ mageia.org. IN A <%= nodes['neru']['ipv4'] %>
mageia.org. IN AAAA <%= nodes['neru']['ipv6'] %>
; madb on mageia.madb.org
-madb 300 IN A 163.172.201.211
+;madb IN A 163.172.201.211
+; temporarily for hosting a redirect while the real madb is down
+madb IN CNAME neru
; since we have a subdomain, we cannot use a CNAME
ml IN A <%= nodes['sucuk']['ipv4'] %>
diff --git a/manifests/nodes/neru.pp b/manifests/nodes/neru.pp
index 8af61124..78cbd021 100644
--- a/manifests/nodes/neru.pp
+++ b/manifests/nodes/neru.pp
@@ -24,6 +24,16 @@ node neru {
include access_classes::web
include openssh::ssh_keys_from_ldap
+ # temporary redirects for madb (2024-11)
+ apache::vhost_redirect { "madb.${::domain}":
+ url => "https://blog.mageia.org/en/2024/10/31/out-with-the-old-madb-and-almost-in-with-the-new/",
+ }
+ apache::vhost_redirect { "ssl_madb.${::domain}":
+ use_ssl => true,
+ vhost => "madb.${::domain}",
+ url => "https://blog.mageia.org/en/2024/10/31/out-with-the-old-madb-and-almost-in-with-the-new/",
+ }
+
openldap::slave_instance { '1':
rid => 1,
}