diff --git a/roles/httpd/reverseproxy/templates/logs.conf b/roles/httpd/reverseproxy/templates/logs.conf deleted file mode 100644 index f4b06d9711..0000000000 --- a/roles/httpd/reverseproxy/templates/logs.conf +++ /dev/null @@ -1,2 +0,0 @@ -CustomLog "logs/{{ name }}-access.log" combined -ErrorLog "logs/{{ name }}-error.log" diff --git a/roles/httpd/reverseproxy/templates/robots.conf b/roles/httpd/reverseproxy/templates/robots.conf deleted file mode 100644 index 040f48d397..0000000000 --- a/roles/httpd/reverseproxy/templates/robots.conf +++ /dev/null @@ -1 +0,0 @@ -Alias /robots.txt /srv/web/robots.txt.{{ name }} diff --git a/roles/httpd/reverseproxy/templates/website.conf b/roles/httpd/reverseproxy/templates/website.conf deleted file mode 100644 index f70b434834..0000000000 --- a/roles/httpd/reverseproxy/templates/website.conf +++ /dev/null @@ -1,51 +0,0 @@ - - ServerName {{ name }} -{% if server_aliases %} - ServerAlias {{ server_aliases | join(" ") }} -{% endif %} - ServerAdmin {{ server_admin }} - TraceEnable Off - -{% if gzip %} - SetOutputFilter DEFLATE -{% endif %} - -{% if sslonly %} - RewriteEngine On - RewriteCond %{HTTPS} off - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE] -{% else %} - Include "conf.d/{{ name }}/*.conf" -{% endif %} - - -{% if ssl %} - - ServerName {{ name }} -{% if server_aliases %} - ServerAlias {{ server_aliases | join(" ") }} -{% endif %} - ServerAdmin {{ server_admin }} - -{% if gzip %} - SetOutputFilter DEFLATE -{% endif %} - - SSLEngine on - SSLCertificateFile /etc/pki/tls/certs/{{ cert_name }}.cert - SSLCertificateKeyFile /etc/pki/tls/private/{{ cert_name }}.key -{% if SSLCertificateChainFile %} - SSLCertificateChainFile /etc/pki/tls/certs/{{ SSLCertificateChainFile }} -{% endif %} - SSLHonorCipherOrder On - - # https://fedorahosted.org/fedora-infrastructure/ticket/4101#comment:14 - # If you change the protocols or cipher suites, you should probably update - # modules/squid/files/squid.conf-el6 too, to keep it in sync. - SSLProtocol -All +TLSv1 +TLSv1.1 +TLSv1.2 - SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK - - Include "conf.d/{{ name }}/*.conf" - -{% endif %} -