Commit 48540cb8 by Jason Bau

A couple of bug fixes.

* should be *_debian_pkgs instead of *_debian_packages
* removed duplicate task
parent b868764e
...@@ -14,3 +14,6 @@ secure_dir: 'secure_example' ...@@ -14,3 +14,6 @@ secure_dir: 'secure_example'
# this indicates the path to site-specific (with precedence) # this indicates the path to site-specific (with precedence)
# things like nginx template files # things like nginx template files
local_dir: '../../ansible_local' local_dir: '../../ansible_local'
# default is not to migrate_db
migrate_db: false
\ No newline at end of file
...@@ -19,12 +19,6 @@ ...@@ -19,12 +19,6 @@
tags: tags:
- ora - ora
- name: install a bunch of system packages on which ora depends
apt: pkg={{item}} state=present
with_items: ora_debian_pkgs
tags:
- ora
- name: create ora application config - name: create ora application config
template: src=ora.env.json.j2 dest=$app_base_dir/env.json mode=0640 owner=www-data group=adm template: src=ora.env.json.j2 dest=$app_base_dir/env.json mode=0640 owner=www-data group=adm
tags: tags:
......
...@@ -15,16 +15,15 @@ ora_source_repo: https://github.com/edx/edx-ora.git ...@@ -15,16 +15,15 @@ ora_source_repo: https://github.com/edx/edx-ora.git
ora_version: 'HEAD' ora_version: 'HEAD'
ora_pre_requirements_file: "{{ ora_code_dir }}/pre-requirements.txt" ora_pre_requirements_file: "{{ ora_code_dir }}/pre-requirements.txt"
ora_post_requirements_file: "{{ ora_code_dir }}/requirements.txt" ora_post_requirements_file: "{{ ora_code_dir }}/requirements.txt"
ora_debian_pkgs: []
ease_code_dir: "{{ app_base_dir }}/ease" ease_code_dir: "{{ app_base_dir }}/ease"
ease_source_repo: https://github.com/edx/ease.git ease_source_repo: https://github.com/edx/ease.git
ease_version: 'HEAD' ease_version: 'HEAD'
ease_pre_requirements_file: "{{ ease_code_dir }}/pre-requirements.txt" ease_pre_requirements_file: "{{ ease_code_dir }}/pre-requirements.txt"
ease_post_requirements_file: "{{ ease_code_dir }}/requirements.txt" ease_post_requirements_file: "{{ ease_code_dir }}/requirements.txt"
ease_debian_pkgs: []
nltk_data_dir: /usr/share/nltk_data nltk_data_dir: /usr/share/nltk_data
ora_debian_packages:
ora_debian_pkgs:
- python-software-properties - python-software-properties
- pkg-config - pkg-config
- curl - curl
...@@ -36,7 +35,7 @@ ora_debian_packages: ...@@ -36,7 +35,7 @@ ora_debian_packages:
- libfreetype6-dev - libfreetype6-dev
- libpng12-dev - libpng12-dev
- libxml2-dev - libxml2-dev
- libxslt-dev - libxslt1-dev
- yui-compressor - yui-compressor
- graphviz - graphviz
- graphviz-dev - graphviz-dev
...@@ -51,7 +50,8 @@ ora_debian_packages: ...@@ -51,7 +50,8 @@ ora_debian_packages:
- liblapack-dev - liblapack-dev
- libatlas-base-dev - libatlas-base-dev
- redis-server - redis-server
ease_debian_packages:
ease_debian_pkgs:
- python-pip - python-pip
- gcc - gcc
- g++ - g++
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment