Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

s/end/endif/g

Browse source
This commit is contained in:
Ralph Bean 2014-12-07 23:55:21 +00:00
parent ed909fd8f8
commit d0cee5b994
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/httpd/website/templates/website.conf
View file

@ -8,7 +8,7 @@
{% if gzip %} {% if gzip %}
SetOutputFilter DEFLATE SetOutputFilter DEFLATE
{% end %} {% endif %}
{% if sslonly %} {% if sslonly %}
RewriteEngine On RewriteEngine On
@ -16,7 +16,7 @@
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE] RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
{% else %} {% else %}
Include "conf.d/{{ name }}/*.conf" Include "conf.d/{{ name }}/*.conf"
{% end %} {% endif %}
</VirtualHost> </VirtualHost>
{% if ssl %} {% if ssl %}
@ -24,19 +24,19 @@
ServerName {{ name }} ServerName {{ name }}
{% if server_aliases %} {% if server_aliases %}
ServerAlias {{ server_aliases.join(" ") }} ServerAlias {{ server_aliases.join(" ") }}
{% end %} {% endif %}
ServerAdmin {{ server_admin }} ServerAdmin {{ server_admin }}
{% if gzip %} {% if gzip %}
SetOutputFilter DEFLATE SetOutputFilter DEFLATE
{% end %} {% endif %}
SSLEngine on SSLEngine on
SSLCertificateFile /etc/pki/tls/certs/{{ cert_name }}.cert SSLCertificateFile /etc/pki/tls/certs/{{ cert_name }}.cert
SSLCertificateKeyFile /etc/pki/tls/private/{{ cert_name }}.key SSLCertificateKeyFile /etc/pki/tls/private/{{ cert_name }}.key
{% if SSLCertificateChainFile %} {% if SSLCertificateChainFile %}
SSLCertificateChainFile /etc/pki/tls/certs/{{ SSLCertificateChainFile }} SSLCertificateChainFile /etc/pki/tls/certs/{{ SSLCertificateChainFile }}
{% end %} {% endif %}
SSLHonorCipherOrder On SSLHonorCipherOrder On
# https://fedorahosted.org/fedora-infrastructure/ticket/4101#comment:14 # https://fedorahosted.org/fedora-infrastructure/ticket/4101#comment:14
@ -47,4 +47,4 @@
Include "conf.d/{{ name }}/*.conf" Include "conf.d/{{ name }}/*.conf"
</VirtualHost> </VirtualHost>
{% end %} {% endif %}