External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7026 from 0xflotus/patch-1

Browse Source 
(docs): enabled syntax highlighting for http patch

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-05-14 20:11:00 +00:00
committed by GitHub
parent 7852f4f054 5d82d89dc2
commit 275c43bd4a
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/cors.md
View File

@@ -5,9 +5,11 @@ AWX supports custom CORS headers via the Django CORS Middleware
To define CORS-specific settings, add them to ``/etc/tower/conf.d/cors.py``: To define CORS-specific settings, add them to ``/etc/tower/conf.d/cors.py``:
CORS_ORIGIN_WHITELIST = ( ```python
'hostname.example.com', CORS_ORIGIN_WHITELIST = (
'127.0.0.1:9000' 'hostname.example.com',
) '127.0.0.1:9000'
)
```
...and restart all AWX services for changes to take effect. ...and restart all AWX services for changes to take effect.

16
docs/custom_virtualenvs.md
View File

@@ -140,14 +140,16 @@ Assigning Custom Virtualenvs
Once you've created a custom virtualenv, you can assign it at the Organization, Once you've created a custom virtualenv, you can assign it at the Organization,
Project, or Job Template level: Project, or Job Template level:
PATCH https://awx-host.example.org/api/v2/organizations/N/ ```http
PATCH https://awx-host.example.org/api/v2/projects/N/ PATCH https://awx-host.example.org/api/v2/organizations/N/
PATCH https://awx-host.example.org/api/v2/job_templates/N/ PATCH https://awx-host.example.org/api/v2/projects/N/
PATCH https://awx-host.example.org/api/v2/job_templates/N/
Content-Type: application/json Content-Type: application/json
{ {
'custom_virtualenv': '/opt/my-envs/custom-venv/' "custom_virtualenv": "/opt/my-envs/custom-venv/"
} }
```
An HTTP `GET` request to `/api/v2/config/` will provide a list of An HTTP `GET` request to `/api/v2/config/` will provide a list of
detected installed virtualenvs: detected installed virtualenvs: