Merge branch 'master' into max/merge-refactor

c199a03c · Max Rothman · cbd81d3e · 3c33048e · c199a03c · c199a03c
Commit c199a03c authored Mar 02, 2015 by Max Rothman
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

playbooks/edx_sandbox.yml
+1 -0

playbooks/roles/insights/defaults/main.yml
+2 -0

No files found.
--- a/playbooks/edx_sandbox.yml
+++ b/playbooks/edx_sandbox.yml
@@ -22,6 +22,7 @@
  roles:
    - role: nginx
      nginx_sites:
+      - certs
      - cms
      - lms
      - forum

--- a/playbooks/roles/insights/defaults/main.yml
+++ b/playbooks/roles/insights/defaults/main.yml
@@ -166,6 +166,8 @@ insights_debian_pkgs:
  - 'libmysqlclient-dev'
  - 'build-essential'
  - gettext
+  - openjdk-7-jdk

 insights_redhat_pkgs:
  - 'community-mysql-devel'
+  - openjdk-7-jdk