External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 17:00:12 -02:30
Code Issues Packages Projects Releases Wiki Activity
9,422 Commits 63 Branches 102 Tags
2eda6b95284379543223052def07a0a47a986316
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Wayne Witzel III 258ddba333 add channels to reqs and defaults 2016-09-27 18:39:19 -04:00
Wayne Witzel III b448621387 adding asgi.py 2016-09-27 18:39:16 -04:00
Wayne Witzel III 5faa21b72d add group_name to channel data 2016-09-27 18:39:14 -04:00
Wayne Witzel III ee09d881a4 only discard if groups have been created previously 2016-09-27 18:39:12 -04:00
Wayne Witzel III 850934c89d remove reply_channel from groups 2016-09-27 18:39:09 -04:00
Wayne Witzel III 4c8aaf1aed converting from socketio to channels websocket 2016-09-27 18:39:07 -04:00
Wayne Witzel III 42aab8ab83 removing websocket notification and service 2016-09-27 18:39:05 -04:00
Wayne Witzel III 74f9372c69 updating pyOpenSSL and cffi versions for django-channels 2016-09-27 18:39:02 -04:00
Wayne Witzel III 62beb24d62 adding initial testing consumers/routes for channels 2016-09-27 18:38:59 -04:00
Wayne Witzel III 6f69163fad Merge pull request #3524 from wwitzel3/devel 
update network cred ssh agent unit test with post_run_hook mock
 2016-09-21 14:13:10 -04:00
Wayne Witzel III 23d7e70204 update network cred ssh agent unit test with post_run_hook mock 2016-09-19 14:24:01 -04:00
Wayne Witzel III de0a885972 Merge pull request #3378 from wwitzel3/release_3.0.2 
fixing deprecated_team.organization credential migration
 2016-08-30 14:51:03 -04:00
Wayne Witzel III fd9d05d5df fixing deprecated_team.organization credential migration 2016-08-30 14:21:16 -04:00
Wayne Witzel III fbcd14d40b Merge pull request #3347 from wwitzel3/issue-3305 
Ensure deprecated_team.org is passed to credential.
 2016-08-26 09:45:38 -04:00
Wayne Witzel III 18e4a33404 update test to check org_auditor access 2016-08-25 13:45:13 -04:00
Wayne Witzel III dbe3f628d4 ensure team organizations are assigned to credentials 2016-08-25 13:44:55 -04:00
Wayne Witzel III efa8496407 Merge pull request #3301 from wwitzel3/release_3.0.2 
remove last_name and first_name from admin_only fields
 2016-08-23 15:17:35 -04:00
Wayne Witzel III c963035178 Merge pull request #3302 from wwitzel3/fix-3153 
prevent non-superusers from adding orphan users
 2016-08-23 15:16:57 -04:00
Wayne Witzel III 2fb386b23c allow users to edit their first and last name 2016-08-23 09:55:00 -04:00
Wayne Witzel III 706e98c392 fixing old tests for new user creation permissions 2016-08-19 18:54:56 -04:00
Wayne Witzel III cef7f5a165 prevent non-superusers from adding orphan users 2016-08-18 09:55:20 -04:00
Wayne Witzel III f30292c7f1 Merge pull request #3192 from wwitzel3/test-refactoring 
Update some tests and refactor some code.
 2016-08-04 11:17:42 -04:00
Wayne Witzel III c5b005fd35 refactor start_event_queryset into model 2016-08-03 15:37:40 -04:00
Wayne Witzel III 720eb8d6fb adding more credential parsing coverage 2016-08-02 10:39:16 -04:00
Wayne Witzel III da0b8ad2ff moving from old to unit folder 2016-08-02 10:39:02 -04:00
Wayne Witzel III 27470b0648 Merge pull request #3160 from wwitzel3/api_3.0.1 
do not allow membership changes to User.admin_role
 2016-07-29 12:37:26 -04:00
Wayne Witzel III b862a13d92 update unit tetsts 2016-07-29 11:30:33 -04:00
Wayne Witzel III 9baa9594c7 use get_object_or_400 to fetch Role 2016-07-29 11:29:49 -04:00
Wayne Witzel III b127e74ae4 refactor to unit tests 2016-07-29 11:29:43 -04:00
Wayne Witzel III 52865eea6a restrict User.admin_role membership changes through RoleUsersList 2016-07-29 11:29:41 -04:00
Wayne Witzel III a431ac7854 fix test 2016-07-29 11:29:39 -04:00
Wayne Witzel III 06bb8871d7 do not allow membership changes to User.admin_role 2016-07-29 11:29:36 -04:00
Wayne Witzel III 3e0d9e4d03 Merge pull request #3126 from wwitzel3/3.0.1 
Restrict what roles you can assign to teams.
 2016-07-27 09:50:26 -04:00
Wayne Witzel III a0c563e831 flake8 fixups 2016-07-26 14:50:48 -04:00
Wayne Witzel III df1464d4bf fixing tests for new team role assignment restrictions 2016-07-26 12:10:19 -04:00
Wayne Witzel III 74b013aad0 driveby cleanup 2016-07-26 12:09:58 -04:00
Wayne Witzel III 9bad20cee3 do not allow assignment of system roles or user.admin_role to teams 2016-07-26 12:09:36 -04:00
Wayne Witzel III 633b27b66b add test for CustomInventoryScript serializer 2016-07-25 17:39:19 -04:00
Wayne Witzel III a801ee7d52 ensure system admin/auditor can see orphan inventory scripts 2016-07-25 17:39:19 -04:00
Wayne Witzel III 81c4a82db8 fix issue with rbac_migrations logger 2016-07-25 11:22:50 -04:00
Wayne Witzel III 03c3ac074c Merge pull request #3022 from wwitzel3/issue-2979 
Fix sysadmin and sysauditor viewing orphan inventory script.
 2016-07-15 15:26:33 -04:00
Wayne Witzel III b9de0b196d add test for CustomInventoryScript serializer 2016-07-15 10:35:44 -04:00
Wayne Witzel III ec2bf4476d ensure system admin/auditor can see orphan inventory scripts 2016-07-14 11:16:16 -04:00
Wayne Witzel III f9707c0ca1 Merge pull request #2922 from wwitzel3/issue-2508 
ensure CustomInventoryScripts render correctly in the ActivityStream
 2016-07-12 08:28:43 -04:00
Wayne Witzel III f7e9d07dad ensure CustomInventoryScripts render correctly in the ActivityStream 2016-07-11 15:25:35 -04:00
Wayne Witzel III c00d32d0eb Merge pull request #2714 from wwitzel3/issue-2706 
ensure the singleton roles show up for sys auditor / sys admins
 2016-07-01 11:11:58 -04:00
Wayne Witzel III 16bc0cdf0b add helper decorator to ensure signleton roles see the proper role list 2016-07-01 10:38:02 -04:00
Wayne Witzel III 47893613a2 ensure the singleton roles show up for sys auditor / sys admins 2016-06-30 10:55:54 -04:00
Wayne Witzel III eb0fc15742 Merge pull request #2690 from wwitzel3/test-refactoring 
Adding some coverage for task helpers.
 2016-06-29 21:11:30 -04:00
Wayne Witzel III 5ef385db20 add extra parametrize test and fix indent error 2016-06-29 20:17:59 -04:00
Wayne Witzel III 32d781175d add and update task unit tests 2016-06-29 12:09:15 -04:00
Wayne Witzel III 479119f3ce add more task unit tests 2016-06-29 12:09:14 -04:00
Wayne Witzel III 4f534122c5 Merge pull request #2675 from wwitzel3/issue-2244 
Do not show the read_role child for Teams
 2016-06-28 11:43:05 -04:00
Wayne Witzel III 994065d495 removing test (already had coverage), fixing test 2016-06-28 11:19:18 -04:00
Wayne Witzel III 4d3d38c4ac ensure read_role is not being returned 2016-06-28 10:56:36 -04:00
Wayne Witzel III 8e89edc27f Do not show the read_role child for Teams 2016-06-28 10:56:08 -04:00
Wayne Witzel III 5456b209ac Merge pull request #2654 from wwitzel3/issue-2485 
reduce activity stream noise
 2016-06-27 15:47:59 -04:00
Wayne Witzel III 3697ddc2d0 fixing Role is None exception 2016-06-27 13:40:50 -04:00
Wayne Witzel III e1853372f7 Adding comments to signals for rbac activity stream 2016-06-27 11:41:00 -04:00
Wayne Witzel III f0418d8841 Merge pull request #2634 from wwitzel3/issue-2560 
Disallow non-admin of a user to add a user to Roles
 2016-06-27 11:28:38 -04:00
Wayne Witzel III 5e2a3b3ef2 reduce activity stream noise by not including implicit role dis/associations 2016-06-27 11:28:06 -04:00
Wayne Witzel III ce3ce8d930 enforce read access for team/child roles 2016-06-27 11:02:07 -04:00
Wayne Witzel III fca4e75e03 missed org.auditor_role in credential read_role 2016-06-24 17:01:11 -04:00
Wayne Witzel III 089065bed1 RoleAccess.can_unattach ensures you have read access member 2016-06-24 16:55:50 -04:00
Wayne Witzel III 87ffded774 renaming Credential.owner_role -> Credential.admin_role 2016-06-24 16:55:07 -04:00
Wayne Witzel III 62293341bf Merge pull request #2592 from wwitzel3/issue-2349 
filter out duplicate entires for the ActivityStream m2m relations
 2016-06-23 11:01:42 -04:00
Wayne Witzel III 68d47cfc93 Merge pull request #2574 from wwitzel3/fix-race 
Ensure teams cannot have org roles as children.
 2016-06-22 17:31:27 -04:00
Wayne Witzel III 5277d30d14 filter out duplicate entires for the ActivityStream m2m relations 2016-06-22 17:25:27 -04:00
Wayne Witzel III 329e81b40e no need for create=True 2016-06-22 15:39:40 -04:00
Wayne Witzel III 1d329856f9 use MagicMock for content_type 2016-06-22 15:36:26 -04:00
Wayne Witzel III 67e516f263 update language in error message 2016-06-22 12:14:11 -04:00
Wayne Witzel III 54e618db2e test org role as child for team 400s 2016-06-22 12:00:32 -04:00
Wayne Witzel III e07a06e990 Teams cannot be parents of Organization roles 2016-06-22 11:59:40 -04:00
Wayne Witzel III 4278330032 Merge pull request #2565 from wwitzel3/3.0 
Fix migration hierarchy updating
 2016-06-22 10:29:47 -04:00