diff options
| author | Milo Casagrande <milo.casagrande@linaro.org> | 2014-02-21 10:39:46 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo.casagrande@linaro.org> | 2014-02-21 10:39:46 +0100 |
| commit | 0c60fd7e1260a5a80a92ea4204b918e1890d1bdd (patch) | |
| tree | c697c829acc0ff065300834817b379ade966723b | |
| parent | b0def9001247c2f895f650c65f7490c9349808f9 (diff) | |
Fixed ansible playbook and hosts.
Change-Id: Ie182641ddc99051bc43e13bc6194531bf1f33d95
| -rw-r--r-- | ansible/hosts | 4 | ||||
| -rw-r--r-- | ansible/roles/status/templates/apache_website.conf | 5 | ||||
| -rw-r--r-- | ansible/roles/status/templates/local_settings.tmpl.py | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ansible/hosts b/ansible/hosts index ab33da4..6313393 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -11,5 +11,5 @@ staging.status.linaro.org ansible_ssh_user=ubuntu role=staging install_dir=stagi staging.roadmap.linaro.org ansible_ssh_user=ubuntu role=staging install_dir=staging.status.linaro.org wsgi_name=staging.status.linaro.org.wsgi wsgi_daemon=staging.roadmap.linaro.org site_function=roadmap site_name=staging.roadmap.linaro.org [production] -status.linaro.org ansible_ssh_user=ubuntu role=production install_dir=status.linaro.org wsgi_name=status.linaro.org.wsgi wsgi_daemon=status.linaro.org site_function=status site_name=status.linaro.org -roadmap.linaro.org ansible_ssh_user=ubuntu role=production install_dir=status.linaro.org wsgi_name=status.linaro.org.wsgi wsgi_daemon=roadmap.linaro.org site_function=roadmap site_name=roadmap.linaro.org +status.linaro.org ansible_ssh_user=ubuntu role=production install_dir=roadmap.linaro.org wsgi_name=roadmap.linaro.org.wsgi wsgi_daemon=status.linaro.org site_function=status site_name=status.linaro.org +roadmap.linaro.org ansible_ssh_user=ubuntu role=production install_dir=roadmap.linaro.org wsgi_name=roadmap.linaro.org.wsgi wsgi_daemon=roadmap.linaro.org site_function=roadmap site_name=roadmap.linaro.org diff --git a/ansible/roles/status/templates/apache_website.conf b/ansible/roles/status/templates/apache_website.conf index 88ec64e..38b267c 100644 --- a/ansible/roles/status/templates/apache_website.conf +++ b/ansible/roles/status/templates/apache_website.conf @@ -38,6 +38,11 @@ WSGILazyInitialization On {% 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 diff --git a/ansible/roles/status/templates/local_settings.tmpl.py b/ansible/roles/status/templates/local_settings.tmpl.py index 05cf53b..50ea4d6 100644 --- a/ansible/roles/status/templates/local_settings.tmpl.py +++ b/ansible/roles/status/templates/local_settings.tmpl.py @@ -8,7 +8,7 @@ AUTH_CROWD_APPLICATION_PASSWORD = '{{ crowd_app_password }}' AUTH_CROWD_SERVER_REST_URI = '{{ crowd_url }}' TRUSTED_ADDRESS = ['10.101.63.171', '10.137.64.8', '82.22.217.167', - '10.191.101.11', '10.165.3.8'] + '10.191.101.11', '10.165.3.8', '10.215.86.3'] JIRA_SERVER = '{{ jira_server }}' JIRA_USERNAME = '{{ jira_username }}' |