openstack
/
openstack-ansible-os_barbican
Code Issues Proposed changes

Remove copy-pasta from Keystone role

This commit is contained in:
Ian Cordasco 2016-03-02 11:48:14 -06:00
parent fed256369f
commit c0450a6ca7
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
templates/barbican-httpd.conf.j2
View File

@ -56,34 +56,3 @@
WSGIScriptAliasMatch ^(/v3/OS-FEDERATION/identity_providers/.*?/protocols/.*?/auth)$ /var/www/cgi-bin/barbican/main/$1
{% endif %}
</VirtualHost>
<VirtualHost *:{{ barbican_admin_port }}>
WSGIDaemonProcess barbican-admin user={{ barbican_system_user_name }} group={{ barbican_system_group_name }} processes={{ barbican_wsgi_processes }} threads={{ barbican_wsgi_threads }} display-name=%{GROUP}
WSGIProcessGroup barbican-admin
WSGIScriptAlias / /var/www/cgi-bin/barbican/admin
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
<IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M"
</IfVersion>
LogLevel {{ barbican_apache_log_level }}
ErrorLog {{ barbican_log_directory }}/barbican-apache-error.log
CustomLog {{ barbican_log_directory }}/ssl_access.log combined
Options +FollowSymLinks
{% if barbican_ssl | bool and barbican_service_adminuri_proto == "https" -%}
SSLEngine on
SSLCertificateFile {{ barbican_ssl_cert }}
SSLCertificateKeyFile {{ barbican_ssl_key }}
{% if barbican_user_ssl_ca_cert is defined -%}
SSLCACertificateFile {{ barbican_ssl_ca_cert }}
{% endif -%}
SSLCompression Off
SSLProtocol {{ barbican_ssl_protocol }}
SSLHonorCipherOrder On
SSLCipherSuite {{ barbican_ssl_cipher_suite }}
SSLOptions +StdEnvVars +ExportCertData
{% endif %}
</VirtualHost>