Merge pull request #55 from rackerlabs/ansible_edits

Updating ansible playbooks with new bower/pip requirements
DefectDojo · Dec 22, 2015 · e81e09a · e81e09a
2 parents 5eef208 + 04ef674
commit e81e09a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/ansible/roles/webserver/tasks/app.yml b/ansible/roles/webserver/tasks/app.yml
@@ -143,32 +143,47 @@
   sudo: yes
   sudo_user: '{{ dd_user }}'
 
-- name: Install pdfkit
+- name: install pdfkit
   pip: name=pdfkit virtualenv={{ venv_dir }}
   sudo: yes
   sudo_user: '{{ dd_user }}'
 
-- name: Run Django 'makemigrations' command
+- name: install django-overextends
+  pip: name=django-overextends virtualenv={{ venv_dir }}
+  sudo: yes
+  sudo_user: '{{ dd_user }}'
+
+- name: Run Django 'makemigrations dojo' command
   django_manage: command='makemigrations dojo' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
   sudo: yes
   sudo_user: '{{ dd_user }}'
 
+- name: Run Django 'makemigrations' command
+  django_manage: command='makemigrations' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
+  sudo: yes
+  sudo_user: '{{ dd_user }}'
+
 - name: Run Django 'migrate' command
   django_manage: command=migrate app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
   sudo: yes
   sudo_user: '{{ dd_user }}'
 
-- name: Run Django 'loaddata' command
+- name: Run Django 'syncdb' command
+  django_manage: command=syncdb app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
+  sudo: yes
+  sudo_user: '{{ dd_user }}'
+
+- name: Run Django 'loaddata' command for product_type
   django_manage: command='loaddata product_type' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
   sudo: yes
   sudo_user: '{{ dd_user }}'
 
-- name: Run Django 'loaddata' command
+- name: Run Django 'loaddata' command for test_type
   django_manage: command='loaddata test_type' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
   sudo: yes
   sudo_user: '{{ dd_user }}'
 
-- name: Run Django 'loaddata' command
+- name: Run Django 'loaddata' command for development_environment
   django_manage: command='loaddata development_environment' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
   sudo: yes
   sudo_user: '{{ dd_user }}'
@@ -191,7 +206,7 @@
     sudo_user: '{{ dd_user }}'
 
 - name: Run 'bower install' command
-  command: bower install
+  command: bower install 
   sudo: yes
   sudo_user: '{{ dd_user }}'
   register: bower_install
@@ -205,22 +220,23 @@
   sudo_user: '{{ dd_user }}'
   when: "bower_install.changed and bower_install.stderr and 'unable to connect to github.com' in bower_install.stderr"
 
-- name: Reinstall Bower
-  command: bower install
+- name: Try installing Bower again, forcing latest versions to try to get compatability..
+  command: bower install --force-latest
   sudo: yes
   sudo_user: '{{ dd_user }}'
   register: bower_install2
   ignore_errors: True
   args: 
     chdir: '{{ dd_install_dir }}/components/'
-  when: "bower_install.changed and bower_install.stderr and 'unable to connect to github.com' in bower_install.stderr"
+  when: "bower_install.changed and bower_install.stderr"
 
-- name: Bower Failure
-  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."
-  when: "bower_install2.changed and bower_install2.stderr and 'unable to connect to github.com' in bower_install2.stderr"
+# - name: Bower Failure
+#   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."
+#   # when: "bower_install2.changed and bower_install2.stderr and 'unable to connect to github.com' in bower_install2.stderr"
+#   when: "bower_install2.changed and bower_install2.stderr"
 
 - name: Run Django 'collectstatic' command
-  django_manage: command=collectstatic app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
+  django_manage: command='collectstatic --noinput' app_path={{ dd_install_dir }} virtualenv={{ venv_dir }}
   sudo: yes
   sudo_user: '{{ dd_user }}'
 

diff --git a/ansible/roles/webserver/templates/settings.j2 b/ansible/roles/webserver/templates/settings.j2
@@ -3,9 +3,9 @@ import os
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 LOGIN_REDIRECT_URL = '/'
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
-SECURE_SSL_REDIRECT = True
-SECURE_BROWSER_XSS_FILTER = True
+# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')
+# SECURE_SSL_REDIRECT = True
+# SECURE_BROWSER_XSS_FILTER = True
 SESSION_COOKIE_HTTPONLY = True
 CSRF_COOKIE_HTTPONLY = True
 TEST_RUNNER = 'django.test.runner.DiscoverRunner'