Skip to content

add some settings to make docker devstack build #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 26, 2018
Merged

add some settings to make docker devstack build #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76d1e28
add some settings to make docker devstack build
thraxil Nov 9, 2018
5d43e9f
Remove the default edxapp secret key to ensure secure defaults
OmarIthawi Sep 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
- Use Ansible 2.3.1.0 so that we can do shallow clones of tags.

- Role: edxapp
- `EDXAPP_EDXAPP_SECRET_KEY` no longer has a default value

- git_clone:
- The working tree is explicitly checked for modified files, to prevent mysterious failures.

Expand Down
2 changes: 2 additions & 0 deletions docker/build/edxapp/ansible_overrides.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ EDXAPP_SEARCH_HOST: 'edx.devstack.elasticsearch'

EDXAPP_PYTHON_SANDBOX: false

EDXAPP_EDXAPP_SECRET_KEY: 'DUMMY KEY ONLY FOR TO DEVSTACK'

edxapp_debian_pkgs_extra:
- mongodb-clients
- mysql-client
Expand Down
5 changes: 4 additions & 1 deletion playbooks/roles/edxapp/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ EDXAPP_COMMENTS_SERVICE_URL: 'http://localhost:18080'
# EDXAPP_COMMENTS_SERVICE_KEY must match FORUM_API_KEY
EDXAPP_COMMENTS_SERVICE_KEY: 'password'

# EDXAPP_EDXAPP_SECRET_KEY: "DUMMY KEY CHANGE BEFORE GOING TO PRODUCTION" # Keep it removed to ensure secure defaults
# EDXAPP_EDXAPP_SECRET_KEY: "DUMMY KEY CHANGE BEFORE GOING TO PRODUCTION" # Commented out to ensure secure defaults

EDXAPP_FERNET_KEYS:
- "DUMMY KEY CHANGE BEFORE GOING TO PRODUCTION"
Expand Down Expand Up @@ -1650,3 +1650,6 @@ SERVICE_WORKER_USERS:
is_superuser: false

EDXAPP_ENABLE_DJANGO_ADMIN_RESTRICTION: false

# for docker devstack
private_requirements_file: "{{ edxapp_app_dir }}/customer_private_requirements.txt"
2 changes: 1 addition & 1 deletion tests/test_playbooks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ansible-playbook -i localhost, --syntax-check travis-test.yml

output_dir="$PWD/test_output/env-dep"
mkdir -p $output_dir
ansible-playbook -i localhost, -c local --tags edxapp_cfg edxapp.yml -e edxapp_user=`whoami` -e edxapp_app_dir=$output_dir -e edxapp_code_dir=$output_dir
ansible-playbook -i localhost, -c local --tags edxapp_cfg edxapp.yml -e edxapp_user=`whoami` -e edxapp_app_dir=$output_dir -e edxapp_code_dir=$output_dir -e EDXAPP_EDXAPP_SECRET_KEY='DUMMY TRAVIS KEY'

root_dir=$output_dir
environment_deployments="."
Expand Down