From f5db96d742f03817a7f1a1e5a50bc3cafef01b98 Mon Sep 17 00:00:00 2001
From: Gordon Messmer <gordon.messmer@gmail.com>
Date: Dec 07 2023 21:49:57 +0000
Subject: [PATCH 1/3] Add configuration directory for TLS-specific items.


---

diff --git a/httpd.spec b/httpd.spec
index 066d182..915bac5 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -418,6 +418,7 @@ done
 
 # install conf file/directory
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \
+      $RPM_BUILD_ROOT%{_sysconfdir}/httpd/ssl-conf.d
       $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d
 install -m 644 $RPM_SOURCE_DIR/README.confd \
     $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
@@ -820,6 +821,7 @@ exit $rv
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/manual.conf
 
 %files -n mod_ssl
+%dir %{_sysconfdir}/httpd/ssl-conf.d
 %{_libdir}/httpd/modules/mod_ssl.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.modules.d/00-ssl.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/ssl.conf
diff --git a/ssl.conf b/ssl.conf
index 373b9e5..9ffae19 100644
--- a/ssl.conf
+++ b/ssl.conf
@@ -215,5 +215,9 @@ BrowserMatch "MSIE [2-5]" \
 CustomLog logs/ssl_request_log \
           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
+# Supplemental configuration
+#
+# Load config files in the "/etc/httpd/conf.d" directory, if any.
+IncludeOptional ssl-conf.d/*.conf
 </VirtualHost>
 

From b5d3cdda09a8454616e0ec6d3f9313cd70254f24 Mon Sep 17 00:00:00 2001
From: Gordon Messmer <gordon.messmer@gmail.com>
Date: Dec 07 2023 23:39:27 +0000
Subject: [PATCH 2/3] Add configuration directory for TLS-specific items.


---

diff --git a/httpd.spec b/httpd.spec
index 915bac5..240a891 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -24,7 +24,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.58
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@@ -418,7 +418,7 @@ done
 
 # install conf file/directory
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d \
-      $RPM_BUILD_ROOT%{_sysconfdir}/httpd/ssl-conf.d
+      $RPM_BUILD_ROOT%{_sysconfdir}/httpd/ssl-conf.d \
       $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d
 install -m 644 $RPM_SOURCE_DIR/README.confd \
     $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README
@@ -861,6 +861,9 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Thu Dec  7 2023 Gordon Messmer <gordon.messmer@gmail.com> - 2.4.58-3
+- add TLS-specific configuration snippet directory
+
 * Thu Nov  2 2023 Joe Orton <jorton@redhat.com> - 2.4.58-2
 - add dependency on apr-util-1(dbm) so a DBM provider is present
 

From a463c8142327b0ae84c26f838faf005b5486951b Mon Sep 17 00:00:00 2001
From: Gordon Messmer <gordon.messmer@gmail.com>
Date: Dec 07 2023 23:50:31 +0000
Subject: [PATCH 3/3] Add configuration directory for TLS-specific items.


---

diff --git a/ssl.conf b/ssl.conf
index 9ffae19..56bf5f4 100644
--- a/ssl.conf
+++ b/ssl.conf
@@ -217,7 +217,7 @@ CustomLog logs/ssl_request_log \
 
 # Supplemental configuration
 #
-# Load config files in the "/etc/httpd/conf.d" directory, if any.
+# Load config files in the "/etc/httpd/ssl-conf.d" directory, if any.
 IncludeOptional ssl-conf.d/*.conf
 </VirtualHost>