aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2014-03-19 10:27:10 +0100
committerMilo Casagrande <milo.casagrande@linaro.org>2014-03-19 10:27:10 +0100
commit4ed4abdbf1a680165cffb22b62e6b0e4774e48da (patch)
tree84c7f9d5037d36acc3d7e6661a73baaa0e5da0d3
parent8dcc989d618186fa4e66c1ddc71ac69ca5b9ba06 (diff)
downloadroadmap-4ed4abdbf1a680165cffb22b62e6b0e4774e48da.tar.gz
Normalized Apache website configuration.
Change-Id: Id0b0561a1620893b3d52df0de3f59e27f675ce02
-rw-r--r--ansible/roles/status/templates/apache_website.conf10
1 files changed, 1 insertions, 9 deletions
diff --git a/ansible/roles/status/templates/apache_website.conf b/ansible/roles/status/templates/apache_website.conf
index 38b267c..f099c11 100644
--- a/ansible/roles/status/templates/apache_website.conf
+++ b/ansible/roles/status/templates/apache_website.conf
@@ -35,17 +35,9 @@ WSGILazyInitialization On
!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:\
CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA"
-{% if role == 'staging' %}
- SSLCertificateFile /etc/ssl/certs/{{ site_name }}.pem
- SSLCertificateKeyFile /etc/ssl/certs/{{ site_name }}.key
-{% endif %}
-{% if site_function == 'roadmap' %}
SSLCertificateFile /etc/ssl/certs/{{ site_name }}.pem
- SSLCertificateKeyFile /etc/ssl/certs/{{ site_name }}.pem
- SSLCACertificateFile /etc/ssl/certs/gd_bundle.crt
-{% else %}
- SSLCertificateFile /etc/ssl/certs/{{ site_name }}.crt
SSLCertificateKeyFile /etc/ssl/certs/{{ site_name }}.key
+{% if role == 'production' %}
SSLCACertificateFile /etc/ssl/certs/gd_bundle.crt
{% endif %}