Skip to content

Commit e81e09a

Browse files
author
devGregA
committed
Merge pull request DefectDojo#55 from rackerlabs/ansible_edits
Updating ansible playbooks with new bower/pip requirements
2 parents 5eef208 + 04ef674 commit e81e09a

File tree

2 files changed

+32
-16
lines changed

2 files changed

+32
-16
lines changed

‎ansible/roles/webserver/tasks/app.yml‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,32 +143,47 @@
143143
sudo: yes
144144
sudo_user: '{{ dd_user }}'
145145

146-
- name: Install pdfkit
146+
- name: install pdfkit
147147
pip: name=pdfkit virtualenv={{ venv_dir }}
148148
sudo: yes
149149
sudo_user: '{{ dd_user }}'
150150

151-
- name: Run Django 'makemigrations' command
151+
- name: install django-overextends
152+
pip: name=django-overextends virtualenv={{ venv_dir }}
153+
sudo: yes
154+
sudo_user: '{{ dd_user }}'
155+
156+
- name: Run Django 'makemigrations dojo' command
152157
django_manage: command='makemigrations dojo' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
153158
sudo: yes
154159
sudo_user: '{{ dd_user }}'
155160

161+
- name: Run Django 'makemigrations' command
162+
django_manage: command='makemigrations' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
163+
sudo: yes
164+
sudo_user: '{{ dd_user }}'
165+
156166
- name: Run Django 'migrate' command
157167
django_manage: command=migrate app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
158168
sudo: yes
159169
sudo_user: '{{ dd_user }}'
160170

161-
- name: Run Django 'loaddata' command
171+
- name: Run Django 'syncdb' command
172+
django_manage: command=syncdb app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
173+
sudo: yes
174+
sudo_user: '{{ dd_user }}'
175+
176+
- name: Run Django 'loaddata' command for product_type
162177
django_manage: command='loaddata product_type' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
163178
sudo: yes
164179
sudo_user: '{{ dd_user }}'
165180

166-
- name: Run Django 'loaddata' command
181+
- name: Run Django 'loaddata' command for test_type
167182
django_manage: command='loaddata test_type' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
168183
sudo: yes
169184
sudo_user: '{{ dd_user }}'
170185

171-
- name: Run Django 'loaddata' command
186+
- name: Run Django 'loaddata' command for development_environment
172187
django_manage: command='loaddata development_environment' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
173188
sudo: yes
174189
sudo_user: '{{ dd_user }}'
@@ -191,7 +206,7 @@
191206
sudo_user: '{{ dd_user }}'
192207

193208
- name: Run 'bower install' command
194-
command: bower install
209+
command: bower install
195210
sudo: yes
196211
sudo_user: '{{ dd_user }}'
197212
register: bower_install
@@ -205,22 +220,23 @@
205220
sudo_user: '{{ dd_user }}'
206221
when: "bower_install.changed and bower_install.stderr and 'unable to connect to github.com' in bower_install.stderr"
207222

208-
- name: Reinstall Bower
209-
command: bower install
223+
- name: Try installing Bower again, forcing latest versions to try to get compatability..
224+
command: bower install --force-latest
210225
sudo: yes
211226
sudo_user: '{{ dd_user }}'
212227
register: bower_install2
213228
ignore_errors: True
214229
args:
215230
chdir: '{{ dd_install_dir }}/components/'
216-
when: "bower_install.changed and bower_install.stderr and 'unable to connect to github.com' in bower_install.stderr"
231+
when: "bower_install.changed and bower_install.stderr"
217232

218-
- name: Bower Failure
219-
fail: msg="It looks like the 'bower install' command has failed. Usually executing `git config --global url.'https://'.insteadOf 'git://'` fixes this issue, but it appears that has not fixed it in this case. Please ensure that you have network connectivity while running the provisioning process."
220-
when: "bower_install2.changed and bower_install2.stderr and 'unable to connect to github.com' in bower_install2.stderr"
233+
# - name: Bower Failure
234+
# fail: msg="It looks like the 'bower install' command has failed. Usually executing `git config --global url.'https://'.insteadOf 'git://'` fixes this issue, but it appears that has not fixed it in this case. Please ensure that you have network connectivity while running the provisioning process."
235+
# # when: "bower_install2.changed and bower_install2.stderr and 'unable to connect to github.com' in bower_install2.stderr"
236+
# when: "bower_install2.changed and bower_install2.stderr"
221237

222238
- name: Run Django 'collectstatic' command
223-
django_manage: command=collectstatic app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
239+
django_manage: command='collectstatic --noinput' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
224240
sudo: yes
225241
sudo_user: '{{ dd_user }}'
226242

‎ansible/roles/webserver/templates/settings.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import os
33
DEBUG = True
44
TEMPLATE_DEBUG = DEBUG
55
LOGIN_REDIRECT_URL = '/'
6-
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
7-
SECURE_SSL_REDIRECT = True
8-
SECURE_BROWSER_XSS_FILTER = True
6+
# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
7+
# SECURE_SSL_REDIRECT = True
8+
# SECURE_BROWSER_XSS_FILTER = True
99
SESSION_COOKIE_HTTPONLY = True
1010
CSRF_COOKIE_HTTPONLY = True
1111
TEST_RUNNER = 'django.test.runner.DiscoverRunner'

0 commit comments

Comments
 (0)