From cdce143628379ab509a31546cef4a9b0331ae660 Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Mon, 25 Jul 2022 17:33:51 -0400
Subject: [PATCH] Include openidc-*.conf in Apache.

This change adds a new configuration in line Apache's frontend
configuration to include (if present) the files generated by the
keystone-openidc charm to configure Open ID Connect configuration

Change-Id: I8c96b1f1ffad84d57276fd60461c1aee60b32d3b
---
 templates/openstack_https_frontend.conf | 1 +
 templates/wsgi-openstack-api.conf       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/templates/openstack_https_frontend.conf b/templates/openstack_https_frontend.conf
index 42a78b85..c26bde04 100644
--- a/templates/openstack_https_frontend.conf
+++ b/templates/openstack_https_frontend.conf
@@ -25,6 +25,7 @@ Listen {{ ext_port }}
     KeepAliveTimeout 75
     MaxKeepAliveRequests 1000
     IncludeOptional /etc/apache2/mellon*/sp-location*.conf
+    IncludeOptional /etc/apache2/openidc*/openidc-*.conf
 </VirtualHost>
 {% endfor -%}
 <Proxy *>
diff --git a/templates/wsgi-openstack-api.conf b/templates/wsgi-openstack-api.conf
index 90cc2829..06fbd5e8 100644
--- a/templates/wsgi-openstack-api.conf
+++ b/templates/wsgi-openstack-api.conf
@@ -39,6 +39,7 @@ Listen {{ public_port }}
         </IfVersion>
     </Directory>
     IncludeOptional /etc/apache2/mellon*/sp-location*.conf
+    IncludeOptional /etc/apache2/openidc*/openidc-*.conf
     IncludeOptional /etc/apache2/kerberos*/apache-kerberos.conf
 </VirtualHost>
 {% endif -%}
@@ -70,6 +71,7 @@ Listen {{ public_port }}
         </IfVersion>
     </Directory>
     IncludeOptional /etc/apache2/mellon*/sp-location*.conf
+    IncludeOptional /etc/apache2/openidc*/openidc-*.conf
     IncludeOptional /etc/apache2/kerberos*/apache-kerberos.conf
 </VirtualHost>
 {% endif -%}
@@ -101,6 +103,7 @@ Listen {{ public_port }}
         </IfVersion>
     </Directory>
     IncludeOptional /etc/apache2/mellon*/sp-location*.conf
+    IncludeOptional /etc/apache2/openidc*/openidc-*.conf
     IncludeOptional /etc/apache2/kerberos*/apache-kerberos.conf
 </VirtualHost>
 {% endif -%}