1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

221 Commits

Author SHA1 Message Date
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
5f5624c5a3 Update to use Modern values for SSL 2016-12-12 12:42:53 -05:00
Wayne Witzel III
4c8af2a4b8 update uwsgi/nginx dev configuration 2016-12-12 12:42:20 -05:00
John Mitchell
d62bad536b add mkdir command to start_development script to cause collectstatic not to error 2016-12-06 12:22:18 -05:00
Matthew Jones
408c79a845 Merge pull request #4219 from sundeep-co-in/STAGE
add django.pot
2016-12-04 21:04:41 -05:00
sundeep-co-in
cd5301bf49 add django.pot 2016-12-02 14:02:13 +05:30
AlanCoding
f3805b1317 enable Logstash auth and prepare for handler for multiple auth types 2016-11-29 14:05:19 -05:00
AlanCoding
f3427d1359 Logging Integration, ELK docker-compose as update file 2016-11-29 13:09:47 -05:00
Aaron Tan
9e4655419e Fix flake8 E302 errors. 2016-11-15 20:59:39 -05:00
Aaron Tan
473ed016de Fix flake8 E305 errors. 2016-11-15 16:32:27 -05:00
AlanCoding
8f3e3c4ae1 change ordering of test dirs 2016-11-14 17:50:10 -05:00
Shane McDonald
30e5904ab3 Use tower_devel as base image for unit tests 2016-11-11 15:47:17 -05:00
Shane McDonald
6f39995060 Fix docker-compose error
Fixes this error:

```
ERROR: yaml.parser.ParserError: while parsing a block mapping
  in "./tools/docker-compose/unit-tests/docker-compose.yml", line 10, column 7
expected <block end>, but found '<scalar>'
  in "./tools/docker-compose/unit-tests/docker-compose.yml", line 11, column 40
```
2016-11-10 13:38:15 -05:00
Shane McDonald
cc359ecbad Default TEST_DIRS in docker-compose 2016-11-10 13:12:29 -05:00
James Laska
90fff3da29 Add fontconfig testjs dependency
Also cleaned up some whitespace for consistency.
2016-11-08 10:18:53 -05:00
Matthew Jones
88a8810815 Merge pull request #3729 from sundeep-co-in/STAGE
enable django i18n
2016-11-04 15:52:33 -04:00
Matthew Jones
b0e40b6c29 Remove proot from dev base image in favor of bubblewrap
Remove python utils from base system, they are included with the venvs
2016-11-03 16:06:03 -04:00
Matthew Jones
e01c86e88f Fix missing import for failure signal handler 2016-11-03 09:43:18 -04:00
Shane McDonald
793ce37a07 Get unit-test container working
node_modules was being overwritten by the bind-mount when the container started. This is kind of hacky, but it’s the only way to do this without changing everything.
2016-11-02 19:30:37 -04:00
Matthew Jones
4cb2e5aa02 Add failure event handler for supervisor process 2016-11-02 13:44:01 -04:00
Shane McDonald
4e81daafec Hack for downgrading npm when using overlay storage driver
https://github.com/npm/npm/issues/9863
2016-11-02 12:22:10 -04:00
Shane McDonald
021666482a Downgrade npm in unit-test image
https://github.com/npm/npm/issues/14042#issuecomment-249139529
2016-11-02 12:08:03 -04:00
sundeep-co-in
4237b2e207 resolve conflict: index.html 2016-10-31 23:40:56 +05:30
Matthew Jones
defd271c90 Make sure we bootstrap the static dir prior to starting 2016-10-28 14:21:19 -04:00
sundeep-co-in
d65e121b19 flake8 compliance 2016-10-28 14:07:08 +05:30
sundeep-co-in
2ddcffc184 zanata config loc 2016-10-27 22:26:39 +05:30
sundeep-co-in
c1a5fb3312 resolve conflict 2016-10-27 08:13:02 +05:30
sundeep-co-in
be93cb488c django-i18n: small fix 2016-10-26 23:31:12 +05:30
sundeep-co-in
3bf72f1dba add manage_translations 2016-10-26 16:47:49 +05:30
Graham Mainwaring
a59b226a68 Merge pull request #3764 from ghjm/packaging_3.1
RPM and setup playbook fixes for 3.1
2016-10-24 15:57:46 -04:00
Graham Mainwaring
b143f53888 Fix RPM builds and setup for 3.1 2016-10-24 14:51:53 -04:00
Chris Meyers
7050c4e09e Revert "no one knows wtf the files in this dir a for, so don't serve them"
This reverts commit b3cccea70368ba1550366380e583751df1df061b.
2016-10-21 10:04:50 -04:00
James Laska
6c4dd57368 Copy requirements individually to avoid invalidating docker cache 2016-10-19 15:56:34 -04:00
James Laska
ac553f7368 Add image to unit-test docker-compose 2016-10-19 13:48:27 -04:00
James Laska
ff8966dd48 Update unittest container to build ui-deps 2016-10-19 12:35:59 -04:00
Chris Meyers
cbffb23d41 no one knows wtf the files in this dir a for, so don't serve them 2016-10-18 17:27:23 -04:00
Chris Meyers
87ea864466 sendfail syscall bad with crappy filesystems 2016-10-18 17:21:14 -04:00
Chris Meyers
64a15db91b fix nginx static files using 2016-10-18 15:51:01 -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
Chris Meyers
47495b4ea6 fix mime type issues 2016-10-18 14:38:24 -04:00
Chris Meyers
ad2bee1f57 sym link nginx config by popular demand 2016-10-18 14:23:33 -04:00
Chris Meyers
4f6d966bab put nginx into honcho flow
* allows for make docker-compose-test then make honcho flow
2016-10-18 14:19:18 -04:00
Wayne Witzel III
e9be93cd70 Update tower_tools image to run nginx 2016-10-18 11:16:38 -04:00
Bill Nottingham
2ed50e05c1 Merge pull request #3714 from wenottingham/devel
Remove support@ansible.com, clean up some old links.
2016-10-17 15:15:52 -04:00
Wayne Witzel III
90ed95abd1 add https ports 2016-10-14 02:23:12 -04:00
Wayne Witzel III
4220246400 use uwsgi/daphne/nginx for dev 2016-10-14 01:45:08 -04:00
Bill Nottingham
afb1fe8d69 Remove support@ansible.com, clean up some old links. 2016-10-13 16:41:34 -04:00
Matthew Jones
babe29ebfa Implement cluster health checks
* Add a local node queue to execute targeted jobs
* Add a setting for active cluster node id (per-node)
* Base the heartbeat time on the `modified` time on the Instance table
* Add periodic task that calls save() on the instance to update the
  heartbeat time if services are up
* Purge/update any ha/instance management commands
* Fix up CELERY_ROUTES settings data structure
2016-10-06 16:05:39 -04:00