openstack
/
charm-keystone
Code Issues Proposed changes

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
This commit is contained in:
Felipe Reyes 2022-07-25 17:33:51 -04:00
parent 965d292bd4
commit cdce143628
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/openstack_https_frontend.conf
View File

@ -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 *>

3
templates/wsgi-openstack-api.conf
View File

@ -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 -%}