From 3e5a49e4c7fc09f4c131aec06bc00a183095a938 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 27 May 2025 14:11:30 -0700
Subject: [PATCH] dns / rdu3: more fixes. Correct path for zones and drop
 expired signatures

The zones I added are not under a view, they are the same for everyone.
And some old no longer used zones are expired and the new named in
rhel9.6 will not load them. So, just drop the signed ones for now.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 roles/dns/files/named.conf |  6 +++---
 roles/dns/files/zones.conf | 30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/roles/dns/files/named.conf b/roles/dns/files/named.conf
index e6bbad6014..0a42ed371e 100644
--- a/roles/dns/files/named.conf
+++ b/roles/dns/files/named.conf
@@ -766,16 +766,16 @@ view "RDU3" {
 
      zone "iad2.fedoraproject.org" {
              type master;
-             file "/var/named/master/built/RDU3/iad2.fedoraproject.org.signed";
+             file "/var/named/master/built/iad2.fedoraproject.org.signed";
      };
      zone "mgmt.iad2.fedoraproject.org" {
              type master;
-             file "/var/named/master/built/RDU3/mgmt.iad2.fedoraproject.org";
+             file "/var/named/master/built/mgmt.iad2.fedoraproject.org";
      };
 
      zone "stg.iad2.fedoraproject.org" {
              type master;
-             file "/var/named/master/built/RDU3/stg.iad2.fedoraproject.org";
+             file "/var/named/master/built/stg.iad2.fedoraproject.org";
      };
 
      include "/etc/named/zones.conf";
diff --git a/roles/dns/files/zones.conf b/roles/dns/files/zones.conf
index 0d09090d1f..bd73f6d9b9 100644
--- a/roles/dns/files/zones.conf
+++ b/roles/dns/files/zones.conf
@@ -10,22 +10,22 @@ zone "_openpgpkey.fedoraproject.org" {
 
 zone "fedora.us" {
         type master;
-        file "/var/named/master/built/fedora.us.signed";
+        file "/var/named/master/built/fedora.us";
 };
 
 zone "fedoralinux.com" {
         type master;
-        file "/var/named/master/built/fedoralinux.com.signed";
+        file "/var/named/master/built/fedoralinux.com";
 };
 
 zone "fedoralinux.net" {
         type master;
-        file "/var/named/master/built/fedoralinux.net.signed";
+        file "/var/named/master/built/fedoralinux.net";
 };
 
 zone "fedoralinux.org" {
         type master;
-        file "/var/named/master/built/fedoralinux.org.signed";
+        file "/var/named/master/built/fedoralinux.org";
 };
 
 zone "fedoramagazine.org" {
@@ -35,12 +35,12 @@ zone "fedoramagazine.org" {
 
 zone "fedoraproject.com" {
         type master;
-        file "/var/named/master/built/fedoraproject.com.signed";
+        file "/var/named/master/built/fedoraproject.com";
 };
 
 zone "fedoraproject.net" {
         type master;
-        file "/var/named/master/built/fedoraproject.net.signed";
+        file "/var/named/master/built/fedoraproject.net";
 };
 
 zone "fedoraproject.co.uk" {
@@ -90,47 +90,47 @@ zone "fedorainfracloud.org" {
 
 zone "fedoraproject.org.uk" {
         type master;
-        file "/var/named/master/built/fedoraproject.org.uk.signed";
+        file "/var/named/master/built/fedoraproject.org.uk";
 };
 
 zone "smolts.org" {
         type master;
-        file "/var/named/master/built/smolts.org.signed";
+        file "/var/named/master/built/smolts.org";
 };
 
 zone "fedoracommunity.org" {
         type master;
-        file "/var/named/master/built/fedoracommunity.org.signed";
+        file "/var/named/master/built/fedoracommunity.org";
 };
 
 zone "nspluginwrapper.org" {
         type master;
-        file "/var/named/master/built/nspluginwrapper.org.signed";
+        file "/var/named/master/built/nspluginwrapper.org";
 };
 
 zone "k12linux.org" {
         type master;
-        file "/var/named/master/built/k12linux.org.signed";
+        file "/var/named/master/built/k12linux.org";
 };
 
 zone "projectofedora.org" {
         type master;
-        file "/var/named/master/built/projectofedora.org.signed";
+        file "/var/named/master/built/projectofedora.org";
 };
 
 zone "168.192.in-addr.arpa" {
         type master;
-        file "/var/named/master/built/168.192.in-addr.arpa.signed";
+        file "/var/named/master/built/168.192.in-addr.arpa";
 };
 
 zone "port389.org" {
         type master;
-        file "/var/named/master/built/port389.org.signed";
+        file "/var/named/master/built/port389.org";
 };
 
 zone "389tcp.org" {
         type master;
-        file "/var/named/master/built/389tcp.org.signed";
+        file "/var/named/master/built/389tcp.org";
 };
 
 //