diff options
| author | Milo Casagrande <milo.casagrande@linaro.org> | 2014-02-10 12:24:35 +0100 |
|---|---|---|
| committer | Milo Casagrande <milo.casagrande@linaro.org> | 2014-02-10 12:24:35 +0100 |
| commit | fad9f26f7beb0988c271d176455ef562548cd55d (patch) | |
| tree | e0c946ce29b991d34e37d06aa876c811e848313a | |
| parent | 805fc18974833a14039f1f79a83b6296e52d6bd2 (diff) | |
Fixed settings problem.
Change-Id: Ida417c59f09b1ebefed952b673ae0f20bbe0198e
| -rw-r--r-- | ansible/roles/status/tasks/local_settings.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/status/templates/local_settings.tmpl.py | 8 | ||||
| -rw-r--r-- | linaroroadmap/settings.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ansible/roles/status/tasks/local_settings.yml b/ansible/roles/status/tasks/local_settings.yml index 9c6d5ee..c63077d 100644 --- a/ansible/roles/status/tasks/local_settings.yml +++ b/ansible/roles/status/tasks/local_settings.yml @@ -1,6 +1,6 @@ # Create the local_settings file and fix its ownership. - name: local-settings - template: src=local_settings.tmpl.py dest={{ install_base }}/{{ install_dir }}/linaroroadmap + template: src=local_settings.tmpl.py dest={{ install_base }}/{{ install_dir }}/linaroroadmap/local_settings.py - name: fix-local-settings-ownership file: path={{ install_base }}/{{ install_dir }}/linaroroadmap/local_settings.py owner={{ apache_user }} group={{ apache_user }} diff --git a/ansible/roles/status/templates/local_settings.tmpl.py b/ansible/roles/status/templates/local_settings.tmpl.py index c9626f4..d8b4f57 100644 --- a/ansible/roles/status/templates/local_settings.tmpl.py +++ b/ansible/roles/status/templates/local_settings.tmpl.py @@ -1,9 +1,9 @@ import random import string -AUTH_CROWD_APPLICATION_USER = '{{ crowd_url }}' -AUTH_CROWD_APPLICATION_PASSWORD = '{{ crowd_app_name }}' -AUTH_CROWD_SERVER_REST_URI = '{{ crowd_app_password }}' +AUTH_CROWD_APPLICATION_USER = '{{ crowd_app_name }}' +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'] @@ -28,7 +28,7 @@ DATABASES = { } AUTHENTICATION_BACKENDS = ( - 'crowdrest.backend.CrowdRestBackend' + 'crowdrest.backend.CrowdRestBackend', ) char_selection = string.ascii_letters + string.digits diff --git a/linaroroadmap/settings.py b/linaroroadmap/settings.py index f2aaf91..361e227 100644 --- a/linaroroadmap/settings.py +++ b/linaroroadmap/settings.py @@ -33,7 +33,7 @@ JIRA_STATUSES = [] SFID = None AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', + #'django.contrib.auth.backends.ModelBackend', ) DATABASES = { |