453ab3bb95
This brings us up to date with the latest apache2 cookbook which included a major refactor in 6.0.0 removing all of the definitions and recipe with proper resources. Instead of using the apache2_default_site resource, directly use a template and then enable the config file using the apache2_site resource. This gives us the most flexibility. - Install mod_wsgi as a package on RHEL since there is no built-in resource for it. - Don't set SELinux to permissive on RHEL (I tested this works properly with it set to enforcing). - Remove hack for restarting apache. - Convert web_app to template and subscribe to restarting apache. - Remove resources to restore SELinux contexts since this taken care of by Chef now automatically. - Remove unused references to log_debug in wsgi template - Add missing WSGISocketPrefix to wsgi template - Additional tests for keystone.conf and identity.conf - Remove unused ldap section tests as we no longer have attributes for it - Include additional cookbooks in Berksfile required for CI Depends-On: https://review.opendev.org/702772 Change-Id: I717247217523e89251e4c0bead0c1a0d114ade2a
37 lines
1.4 KiB
Plaintext
37 lines
1.4 KiB
Plaintext
<%= node['openstack']['identity']['custom_template_banner'] %>
|
|
|
|
<VirtualHost <%= @server_host %>:<%= @server_port %>>
|
|
WSGIDaemonProcess identity processes=5 threads=1 user=<%= @user %> group=<%= @group %> display-name=%{GROUP}
|
|
WSGIProcessGroup identity
|
|
WSGIScriptAlias / <%= @server_entry %>
|
|
WSGIApplicationGroup %{GLOBAL}
|
|
WSGIPassAuthorization On
|
|
|
|
ErrorLogFormat "%{cu}t %M"
|
|
ErrorLog <%= @log_dir %>/identity.log
|
|
CustomLog <%= @log_dir %>/identity_access.log combined
|
|
|
|
<Directory /usr/bin>
|
|
Require all granted
|
|
</Directory>
|
|
<% if node['openstack']['identity']['ssl']['enabled'] -%>
|
|
|
|
SSLEngine On
|
|
SSLCertificateFile <%= node['openstack']['identity']['ssl']['certfile'] %>
|
|
SSLCertificateKeyFile <%= node['openstack']['identity']['ssl']['keyfile'] %>
|
|
SSLCACertificatePath <%= node['openstack']['identity']['ssl']['ca_certs_path'] %>
|
|
<% if node['openstack']['identity']['ssl']['chainfile'] %>
|
|
SSLCertificateChainFile <%= node['openstack']['identity']['ssl']['chainfile'] %>
|
|
<% end -%>
|
|
SSLProtocol <%= node['openstack']['identity']['ssl']['protocol'] %>
|
|
<% if node['openstack']['identity']['ssl']['ciphers'] -%>
|
|
SSLCipherSuite <%= node['openstack']['identity']['ssl']['ciphers'] %>
|
|
<% end -%>
|
|
<% if node['openstack']['identity']['ssl']['cert_required'] -%>
|
|
SSLVerifyClient require
|
|
<% end -%>
|
|
<% end -%>
|
|
</VirtualHost>
|
|
|
|
WSGISocketPrefix <%= @run_dir %>
|