diff options
| -rw-r--r-- | ansible/group_vars/all | 2 | ||||
| -rw-r--r-- | ansible/roles/status/tasks/local_settings.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/status/templates/local_settings.tmpl.py | 44 | ||||
| -rw-r--r-- | linaroroadmap/local_settings.py.dev | 11 | ||||
| -rw-r--r-- | linaroroadmap/settings.py | 10 |
5 files changed, 51 insertions, 18 deletions
diff --git a/ansible/group_vars/all b/ansible/group_vars/all index 8a32cd0..4121de0 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -2,6 +2,6 @@ install_base: /srv roadmap_repo: http://git.linaro.org/git/infrastructure/roadmap.git apache_user: www-data -crowd_url: https://login.linaro.org:8443/crowd/rest +crowd_url: https://login.linaro.org:8443/crowd/rest/usermanagement/1 jira_server: https://cards.linaro.org jira_sfid: 10301 diff --git a/ansible/roles/status/tasks/local_settings.yml b/ansible/roles/status/tasks/local_settings.yml index 9790836..9c6d5ee 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.py dest={{ install_base }}/{{ install_dir }}/linaroroadmap + template: src=local_settings.tmpl.py dest={{ install_base }}/{{ install_dir }}/linaroroadmap - 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 new file mode 100644 index 0000000..c9626f4 --- /dev/null +++ b/ansible/roles/status/templates/local_settings.tmpl.py @@ -0,0 +1,44 @@ +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 }}' + +TRUSTED_ADDRESS = ['10.101.63.171', '10.137.64.8', '82.22.217.167', + '10.191.101.11', '10.165.3.8'] + +JIRA_SERVER = '{{ jira_server }}' +JIRA_USERNAME = '{{ jira_username }}' +JIRA_PASSWORD = '{{ jira_password }}' + +JIRA_PROJECT = 'Linaro Roadmap' +JIRA_STATUSES = ['Closed', 'Resolved', 'In Progress', 'Open', 'Reopend'] +SFID = {{ jira_sfid }} + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': '{{ install_base }}/{{ install_dir }}/linaroroadmap.db', + 'USER': '', + 'PASSWORD': '', + 'HOST': '', + 'PORT': '', + } +} + +AUTHENTICATION_BACKENDS = ( + 'crowdrest.backend.CrowdRestBackend' +) + +char_selection = string.ascii_letters + string.digits +char_selection += '!@#$%^&*(-_=+)' + +SECRET_KEY = '{0}'.format(''.join(random.sample(char_selection, 50))) + +STATIC_ROOT = '/var/www/{{ install_dir }}/static/' +{% if role == 'staging' %} +DEBUG = True +{% else %} +DEBUG = False +{% endif %} diff --git a/linaroroadmap/local_settings.py.dev b/linaroroadmap/local_settings.py.dev index 8b6d4ab..a7da2fa 100644 --- a/linaroroadmap/local_settings.py.dev +++ b/linaroroadmap/local_settings.py.dev @@ -1,12 +1,9 @@ import random import string -CROWD = { - 'url': '', - 'app_name': '', - 'password': '', - 'superuser': False, -} +AUTH_CROWD_APPLICATION_USER = '' +AUTH_CROWD_APPLICATION_PASSWORD = '' +AUTH_CROWD_SERVER_REST_URI = '' JIRA_SERVER = None JIRA_USERNAME = None @@ -17,7 +14,7 @@ JIRA_STATUSES = [] SFID = None AUTHENTICATION_BACKENDS = ( - 'crowd.backends.CrowdBackend', + 'crowdrest.backend.CrowdRestBackend', ) char_selection = string.ascii_letters + string.digits diff --git a/linaroroadmap/settings.py b/linaroroadmap/settings.py index dff037b..f2aaf91 100644 --- a/linaroroadmap/settings.py +++ b/linaroroadmap/settings.py @@ -19,13 +19,6 @@ AUTH_CROWD_SERVER_TRUSTED_ROOT_CERTS_FILE = None TRUSTED_ADDRESS = [] -CROWD = { - 'url': '', - 'app_name': '', - 'password': '', - 'superuser': False, -} - # The URL of the Jira server to connect to. JIRA_SERVER = None # The user name to use to connect to JIRA_SERVER. @@ -40,8 +33,7 @@ JIRA_STATUSES = [] SFID = None AUTHENTICATION_BACKENDS = ( - #'django.contrib.auth.backends.ModelBackend', - 'crowdrest.backend.CrowdRestBackend', + 'django.contrib.auth.backends.ModelBackend', ) DATABASES = { |