External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
11,563 Commits 65 Branches 102 Tags
8c4d4a0543f13d172f8385a3f8499068a478f31e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wayne Witzel III 1851276b10 Merge pull request #5271 from wwitzel3/release_3.1.0 
Rewrite type to polymorphic_ctype__model for certain filter requests
 2017-02-09 11:42:19 -05:00
Wayne Witzel III 0562e4baad Rewrite type to polymorphic_ctype__model for certain filter requests 2017-02-09 09:55:25 -05:00
Wayne Witzel III 753cbf18e1 Merge pull request #5206 from wwitzel3/release_3.1.0 
fix functional job runtime params tests
 2017-02-06 15:02:55 -05:00
Wayne Witzel III dee359254f fix functional job runtime params tests 2017-02-06 14:50:51 -05:00
Wayne Witzel III 978a5fbcdc Merge pull request #5156 from wwitzel3/issue-5036 
only assign the default if it is not None
 2017-02-02 14:53:36 -05:00
Wayne Witzel III ec86961e13 only assign the default if it is not None 2017-02-02 14:48:31 -05:00
Wayne Witzel III 71c190e025 Merge pull request #5122 from wwitzel3/release_3.1.0 
remove check of http_session, not needed with auth_token
 2017-02-02 10:13:40 -05:00
Wayne Witzel III 70f8dfe8fe remove use of http_session, not needed with auth_token 2017-02-01 12:59:09 -05:00
Wayne Witzel III eada4ce83f Merge pull request #5095 from jaredevantabor/remove-token-from-sockets 
removing token from websocket connection url
 2017-02-01 09:27:22 -05:00
Wayne Witzel III d6ac673b3f Merge pull request #5101 from wwitzel3/issue-4978 
users from the http_session and /websocket RBAC
 2017-02-01 09:27:01 -05:00
Wayne Witzel III 9e7ae673b6 rework authentication to respect all possible backends using DRF auth_token 2017-02-01 00:21:18 -05:00
Wayne Witzel III 36c06020b4 Get users from the http_session, authorize job, workflow, and adhoc event access against RBAC 2017-01-31 20:19:45 -05:00
Wayne Witzel III e0d9a2aed7 Merge pull request #5041 from wwitzel3/issue-5035 
fix KeyError for default, added tests
 2017-01-30 13:40:18 -05:00
Wayne Witzel III 755e408cd9 fix fields with no defaults showing in extra_vars display when not provided 2017-01-30 13:29:55 -05:00
Wayne Witzel III 5ace8dad4e fix KeyError for default, added tests 2017-01-30 12:15:43 -05:00
Wayne Witzel III 7807ee09f9 Merge pull request #4915 from wwitzel3/issue-4636 
Mask the default value for password fields in survey_spec.
 2017-01-27 02:37:16 -05:00
Wayne Witzel III df9bb829fc fix KeyError with spec 2017-01-24 16:53:48 -05:00
Wayne Witzel III fba1fa83d0 reduce, reuse, recycle 2017-01-24 16:44:42 -05:00
Wayne Witzel III 735f5d14b3 ensure that launching respects default values 2017-01-24 16:39:41 -05:00
Wayne Witzel III cf6c4fe7ac mask the default value for survey_spec password fields 2017-01-24 13:03:57 -05:00
Wayne Witzel III 8625d670ac Merge pull request #4745 from wwitzel3/release_3.1.0 
remove extra censoring code from tower, not needed since Ansible 2.1+
 2017-01-16 20:29:44 -05:00
Wayne Witzel III 9592c67c31 fixing flake8 errors 2017-01-16 14:16:24 -05:00
Wayne Witzel III cd5eed9828 remove extra censoring code from tower, not needed since Ansible 2.1+ 2017-01-16 13:54:07 -05:00
Wayne Witzel III f95f75c55a Merge pull request #4435 from wwitzel3/release_3.1.0 
use DjangoJSONEncoder
 2016-12-14 13:13:13 -05:00
Wayne Witzel III 13798d352c use DjangoJSONEncoder 2016-12-14 12:49:50 -05:00
Wayne Witzel III f6a7b4c673 Merge pull request #4409 from wwitzel3/release_3.1.0 
squashed migrations to allow for migration removal after 3.1 release
 2016-12-13 14:51:23 -05:00
Wayne Witzel III 434b0f1f25 remove unneeded data migrations from squashed migrations 2016-12-13 14:42:24 -05:00
Wayne Witzel III 384dbb6da2 renamed squashed migrations to start at 0002 2016-12-13 14:41:23 -05:00
Wayne Witzel III d79748bda7 Merge pull request #4414 from wwitzel3/r310 
allow API requests from localhost/127.0.0.1 to be insecure
 2016-12-13 13:53:58 -05:00
Wayne Witzel III a8217ae3d3 adding squashed migrations to allow for migration removal after 3.1 release 2016-12-13 11:53:36 -05:00
Wayne Witzel III 2069473534 allow API requests from localhost/127.0.0.1 to be insecure 2016-12-13 11:47:13 -05:00
Wayne Witzel III 623d0a8df6 Merge pull request #4398 from wwitzel3/release_3.1.0 
Consolidate 3.1 migrations.
 2016-12-13 08:38:31 -05:00
Wayne Witzel III c9dab5805d update imports and further consolidate 2016-12-12 19:22:09 -05:00
Wayne Witzel III 83b985ed2e tower settings removal depends on conf migration 2016-12-12 19:21:10 -05:00
Wayne Witzel III 783e86bd41 Consolidate 3.1.0 migrations 2016-12-12 19:21:08 -05:00
Wayne Witzel III 824fb21b3f Merge pull request #4357 from wwitzel3/release_3.1.0 
Update uwsgi/nginx configurations.
 2016-12-12 14:08:01 -05:00
Wayne Witzel III 19f7d9e8d8 redirect if no forward-slash 2016-12-12 13:25:10 -05:00
Wayne Witzel III c6e1598b9c explicitly set long harakiri time to deal with very large inventory deletes 2016-12-12 12:44:05 -05:00
Wayne Witzel III fafec3a0e3 Update to use Modern values for SSL 2016-12-12 12:42:56 -05:00
Wayne Witzel III 5f5624c5a3 Update to use Modern values for SSL 2016-12-12 12:42:53 -05:00
Wayne Witzel III 88dc742f42 update uwsgi/nginx production configuration 2016-12-12 12:42:51 -05:00
Wayne Witzel III 4c8af2a4b8 update uwsgi/nginx dev configuration 2016-12-12 12:42:20 -05:00
Wayne Witzel III 25915eb55a Merge pull request #4039 from wwitzel3/workflow-channels 
Workflow Event Channels Integration
 2016-11-18 14:41:40 -05:00
Wayne Witzel III d882a14d87 fix group_name for workflow_events 2016-11-17 17:22:31 -05:00
Wayne Witzel III cd084f5c60 removed JobEventSerializer additions, consolidated migrations, swapped job_events and jobs channel updates 2016-11-17 17:03:41 -05:00
Wayne Witzel III 62d0b9fc98 Merge branch 'devel' into workflow-channels 2016-11-17 16:22:52 -05:00
Wayne Witzel III 9dda4d452f renamed Workflow channel migration 2016-11-16 11:02:35 -05:00
Wayne Witzel III 34439fed9d Merge branch 'devel' into workflow-channels 2016-11-16 11:01:10 -05:00
Wayne Witzel III 6d14af336c added Workflow migrations for channels integrations 2016-11-16 09:51:31 -05:00
Wayne Witzel III 9fb4e75711 update websockets documentation 2016-11-16 09:43:56 -05:00
Wayne Witzel III a80e54a62e Merge branch 'devel' into workflow-channels 2016-11-14 16:03:22 -05:00
Wayne Witzel III 324d2dca72 add JobEvent and UnifiedJob workflow property unit tests 2016-11-14 14:29:52 -05:00
Wayne Witzel III 5bf00fe96b Output WorkflowEvents on a dedicated channel 2016-11-14 14:28:56 -05:00
Wayne Witzel III 42f1a491c1 add WorkflowJob properties to UnifiedJob 2016-11-10 15:11:00 -05:00
Wayne Witzel III 43450c2694 WorkflowJob should set the workflow launch_type for spawned jobs 2016-11-10 15:10:56 -05:00
Wayne Witzel III ed64d4521c Remerge: only allow superusers to start a job from a SystemJobTemplate 2016-11-08 10:52:07 -05:00
Wayne Witzel III ad56325993 added some documentation about channels/websockets 2016-11-04 09:58:24 -04:00
Wayne Witzel III b7ef93d2b5 Merge pull request #3772 from wwitzel3/channels-fixups 
channels fixups
 2016-11-01 09:49:30 -04:00
Wayne Witzel III 6dd0f55ce2 Merge branch 'devel' into channels-fixups 2016-10-27 14:23:01 -04:00
Wayne Witzel III c5a9439198 Merge pull request #3776 from wwitzel3/release_3.0.3 
Revert "filter internal User.admin_roles from the /roles API list view"
 2016-10-27 14:16:13 -04:00
Wayne Witzel III b11f5c3015 Revert "filter internal User.admin_roles from the /roles API list view" 
This reverts commit 2a55bfa5741e91c466570e7b4cf9b517d366c610.
 2016-10-25 13:40:15 -04:00
Wayne Witzel III ced3c41df9 add auth_token verification to websocket 2016-10-24 19:42:53 -04:00
Wayne Witzel III 04bfdf8617 Merge branch 'devel' of https://github.com/ansible/ansible-tower into channels-fixups 2016-10-24 19:42:16 -04:00
Wayne Witzel III af82273948 don't double encode channel messages 2016-10-20 09:37:06 -04:00
Wayne Witzel III 1e658219c4 Merge pull request #3741 from wwitzel3/nginx-static 
fix awx/ui static path
 2016-10-18 15:08:16 -04:00
Wayne Witzel III 99a009b613 fix awx/ui static path 2016-10-18 15:05:05 -04:00
Wayne Witzel III a27c708127 let nginx serve static files 2016-10-18 14:52:10 -04:00
Wayne Witzel III 699e2c9c6f Merge pull request #3738 from wwitzel3/nginx-updates 
make static directory before collecting
 2016-10-18 13:01:12 -04:00
Wayne Witzel III e716f6e259 make static directory before collecting 2016-10-18 12:58:11 -04:00
Wayne Witzel III dd108549b6 Merge pull request #3736 from wwitzel3/nginx-updates 
fix static files for API browser
 2016-10-18 12:35:35 -04:00
Wayne Witzel III f5e10bc57c fix static files for API browser 2016-10-18 12:15:01 -04:00
Wayne Witzel III c0ae37dd54 Merge pull request #3735 from wwitzel3/nginx-updates 
Update tower_tools image to run nginx
 2016-10-18 11:35:25 -04:00
Wayne Witzel III e9be93cd70 Update tower_tools image to run nginx 2016-10-18 11:16:38 -04:00
Wayne Witzel III f5f4785714 Merge pull request #3668 from wwitzel3/channels-deployment 
Channels deployment
 2016-10-17 15:46:42 -04:00
Wayne Witzel III d027c98a8f Merge pull request #3720 from wwitzel3/dev-nginx 
change static path to match what ui-release produces
 2016-10-17 10:07:36 -04:00
Wayne Witzel III 3a323e1b39 change static path to match what ui-release produces 2016-10-17 09:58:15 -04:00
Wayne Witzel III 0c7014eacb nginx config fixes 2016-10-14 13:38:09 -04:00
Wayne Witzel III 1d677dad91 Merge branch 'devel' into channels-deployment 2016-10-14 13:33:51 -04:00
Wayne Witzel III 7ea84d92ef Merge pull request #3716 from wwitzel3/dev-nginx 
Use uwsgi/daphne/nginx for dev
 2016-10-14 13:27:44 -04:00
Wayne Witzel III 0666e40be8 fix make server to run other services 2016-10-14 12:04:30 -04:00
Wayne Witzel III 90ed95abd1 add https ports 2016-10-14 02:23:12 -04:00
Wayne Witzel III eb3ec0b083 daphne should listen on 0.0.0.0 2016-10-14 02:00:56 -04:00
Wayne Witzel III 4220246400 use uwsgi/daphne/nginx for dev 2016-10-14 01:45:08 -04:00
Wayne Witzel III 280d265d4e filter internal User.admin_roles from the /roles API list view 2016-10-13 12:29:02 -04:00
Wayne Witzel III e4e878d041 copy nginx config and uwsgi_params 2016-10-07 14:41:34 -04:00
Wayne Witzel III c64392eb67 removing old apache, renaming nginx config 2016-10-07 10:50:30 -04:00
Wayne Witzel III 579df6e215 new configuration files for uwsgi/daphne 2016-10-07 10:47:15 -04:00
Wayne Witzel III 594fa8cf89 Merge pull request #3657 from wwitzel3/jtabor-sockets 
Switch to Django Channels
 2016-10-07 10:39:04 -04:00
Wayne Witzel III 5d8e7c17c2 Merge branch 'devel' into jtabor-sockets 2016-10-07 09:50:03 -04:00
Wayne Witzel III 48d49b41cb revert to old rabbitmq 2016-10-07 09:46:57 -04:00
Wayne Witzel III 163ec843fd update channels reqs 2016-10-06 16:32:35 -04:00
Wayne Witzel III 39f337d933 added model for holding channel group information, updating asgi_amsqp req 2016-10-06 16:16:27 -04:00
Wayne Witzel III 9049fb208f Merge branch 'devel' of https://github.com/ansible/ansible-tower into jtabor-sockets 2016-10-06 10:06:30 -04:00
Wayne Witzel III 71c84a6383 convert scheduler to use websocket 2016-10-06 09:58:51 -04:00
Wayne Witzel III 6d4a2a8f8e converting from socketio to channels websocket 2016-10-04 14:13:16 -07:00
Wayne Witzel III 1a9843d5d1 adding initial channels integration 2016-10-04 14:04:52 -07:00
Wayne Witzel III e4c5b9cb18 Merge pull request #3642 from wwitzel3/channels-up 
Merge dev and latest channels branch changes.
 2016-10-03 10:47:54 -04:00
Wayne Witzel III 0088c5a410 add asgi_amqp req 2016-10-03 10:43:44 -04:00
Wayne Witzel III 3fab2b63b9 dev non-clustering rabbitmq with lvc enabled 2016-10-03 10:42:52 -04:00
Wayne Witzel III 530a5c0c88 merging devel 2016-10-03 10:35:50 -04:00