Skip to content
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.

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

Add install docs command and update make html command #60

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
add_mail_admins_logging_handler: false
onadata_system_user: "onadata"
onadata_system_group: "{{ onadata_system_user }}"
onadata_system_user_home: "/home/{{ onadata_system_user }}"
Expand Down Expand Up @@ -209,6 +210,9 @@ onadata_celery_task_route:
permissions_async:
- "onadata.libs.utils.project_utils.set_project_perms_to_xform_async"
- "onadata.libs.utils.project_utils.propagate_project_permissions_async"
- "onadata.apps.api.tasks.add_org_user_and_share_projects_async"
- "onadata.apps.api.tasks.remove_org_user_async"
- "onadata.apps.api.tasks.share_project_async"

# Cache control maximum age in seconds
onadata_cache_control_max_age: 30
Expand Down Expand Up @@ -240,7 +244,8 @@ onadata_wsgi_cheaper_overload: 30

# Pricing library
onadata_include_pricing: false
onadata_pricing_version: "v0.8.0"
onadata_load_pricing_account_fixtures: false
onadata_pricing_version: "v2.1.4"
onadata_zoho_auth_token:
onadata_zoho_api_token:
onadata_zoho_org_id:
Expand Down
2 changes: 1 addition & 1 deletion tasks/init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
virtualenv: "{{ onadata_venv_path }}"
fixtures: "{{ onadata_venv_path }}/src/pricing/pricing/fixtures/initial_accounts.json"
settings: "{{ onadata_settings_module }}"
when: onadata_include_pricing
when: onadata_load_pricing_account_fixtures
16 changes: 15 additions & 1 deletion tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,24 @@
when:
- not onadata_unmanaged_git_key

- name: Install docs.pip
become: true
become_user: "{{ onadata_system_user }}"
shell: "source {{ onadata_venv_path }}/bin/activate && python -m pip install --no-cache-dir -r requirements/docs.pip"
args:
executable: /bin/bash
chdir: "{{ onadata_codebase_path }}"

- name: Generate Docs
become: true
become_user: "{{ onadata_system_user }}"
shell: "source {{ onadata_venv_path }}/bin/activate && /usr/bin/make html"
shell: "source {{ onadata_venv_path }}/bin/activate && make html"
args:
executable: /bin/bash
chdir: "{{ onadata_codebase_path }}/docs"

- name: Fix libsassl erorr
become: true
shell: "ln -sfn /usr/lib/x86_64-linux-gnu/sasl2/ /usr/lib64/sasl2"
args:
executable: /bin/bash
Original file line number Diff line number Diff line change
Expand Up @@ -480,12 +480,14 @@ LOGGING = {
},
},
'handlers': {
{% if add_mail_admins_logging_handler %}
'mail_admins': {
'level': 'ERROR',
'filters': ['require_debug_false', 'skip_suspicious_operations'],
'class': 'django.utils.log.AdminEmailHandler',
'email_backend': '{{ onadata_mail_admins_email_backend }}'
},
{% endif %}
'console': {
'level': 'DEBUG',
'class': 'logging.StreamHandler',
Expand Down
Loading