External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 16:30:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
25,893 Commits 63 Branches 102 Tags
131f5ff0186545adec19e0cfe0d342e2d2cbdec6
Commit Graph
63 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Graham Mainwaring d55b223aae Use sysconfig file to get the list of services 2020-04-24 14:08:24 -04:00
Graham Mainwaring e36ffa5764 Return more status information from ansible-tower-service status and error check commands better 2020-04-24 11:37:16 -04:00
Graham Mainwaring 08839e1381 Add approved_by field to workflow approvals 2019-10-11 16:57:13 -04:00
Graham Mainwaring 617d6a8cf4 Merge pull request #1851 from ghjm/devel 
Move data migration docs to root dir
 2018-05-04 10:12:40 -04:00
Graham Mainwaring 6db32e5c3e Merge pull request #1848 from rooftopcellist/data_migration_docs 
Adds data migration docs for upgrades
 2018-05-04 10:07:03 -04:00
Graham Mainwaring 4082cb4e60 Merge pull request #5706 from ghjm/setup_params 
Allow passing ansible-playbook parameters transparently through setup.sh
 2017-03-13 15:14:39 -04:00
Graham Mainwaring ead643eff4 Merge pull request #5692 from ghjm/windows_scan_packages_fix 
Fix case where Get-ChildItems does not return any results
 2017-03-10 16:52:36 -05:00
Graham Mainwaring 97121bd355 Merge pull request #5674 from ghjm/packer_fixes 
Fixes for Vagrant build
 2017-03-08 21:09:55 -05:00
Graham Mainwaring 4b68a2f208 Merge pull request #5582 from ghjm/devel 
Fix MD5 for CentOS 7.3 ISO
 2017-02-28 14:21:17 -05:00
Graham Mainwaring 7d209d2dda Merge pull request #4894 from ghjm/deb_no_apache 
Remove unnecessary mucking about with Apache config
 2017-01-24 11:23:01 -05:00
Graham Mainwaring 9885bcf4f2 Merge pull request #4723 from ghjm/bundle_fix 
Add jlaska-rabbitmq COPR repo and key to bundled installer
 2017-01-13 15:05:38 -05:00
Graham Mainwaring d8ee92aefd Merge pull request #4307 from ghjm/move_ui_deps_to_ansible_repo 
Move npm dependencies to Ansible github org
 2016-12-06 10:18:57 -05:00
Graham Mainwaring 81fa4ddcf1 Merge pull request #4299 from ghjm/move_ui_deps_to_ansible_repo_take_2 
Move npm dependencies to Ansible github org
 2016-12-06 10:07:42 -05:00
Graham Mainwaring 6f50a450af Merge pull request #3943 from ghjm/devel 
Remove obsolete script
 2016-11-10 14:54:35 -05:00
Graham Mainwaring 313a8a7d67 Merge pull request #3933 from ghjm/deb_nginx_2 
Fix uwsgi and daphne bin install
 2016-11-09 16:20:30 -05:00
Graham Mainwaring 62caaa728c Merge pull request #3903 from ghjm/deb_nginx 
3.1 deb build, not including bubblewrap
 2016-11-07 17:56:02 -05:00
Graham Mainwaring 93ef8f7240 3.1 deb build, not including bubblewrap 2016-11-07 17:54:24 -05:00
Graham Mainwaring f3cb5816d5 Merge pull request #3843 from ghjm/devel 
Can't use bash syntax since make uses /bin/sh
 2016-11-02 14:01:12 -04:00
Graham Mainwaring b05cd9e5c6 Can't use bash syntax since make uses /bin/sh 2016-11-02 13:46:49 -04:00
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 ddf67ed915 Merge pull request #3688 from ghjm/win_scan_scripts_include 
Include Powershell scripts for Windows scan jobs
 2016-10-11 14:19:38 -04:00
Graham Mainwaring 3ffeb5b0ba Merge pull request #3656 from ghjm/scan_windows_fix 
Change names of Windows scan modules to avoid ambiguity
 2016-10-06 10:45:49 -04:00
Graham Mainwaring 4ca8bc1eda Merge pull request #3630 from ghjm/restore_apache_fix 
Use correct Apache service name when restoring on EL6
 2016-09-30 13:28:14 -04:00
Graham Mainwaring bcc9d3a3ac Merge pull request #3611 from ghjm/makefile-flagfiles 
Add Makefile flag file for ui-release
 2016-09-28 17:25:52 -04:00
Graham Mainwaring 8a0f7b1354 Merge pull request #3495 from ghjm/rabbitmq_deb 
Add RabbitMQ and memcached to Ubuntu builds/installs
 2016-09-15 11:28:28 -04:00
Graham Mainwaring f36ff01a5b Merge pull request #3312 from ghjm/make_clean_venv 
Clean venv on 'make clean'
 2016-08-23 10:47:47 -04:00
Graham Mainwaring d51edff8a8 Ubuntu 16 support (#3251) 2016-08-16 13:41:23 -04:00
Graham Mainwaring 7ef92a609f Windows scan jobs (#3034) 
Implements simple package, service and file scanning for Windows.
 2016-08-10 10:19:26 -04:00
Graham Mainwaring e93fde2f1a Add VMware provider for Vagrant images and rename make targets (#3180) 
This change adds a Makefile target to build a Vagrant .box file that uses the VMware Vagrant provider. Previously, we could only build Virtualbox .box files. The Virtualbox Makefile target is renamed from virtualbox-ovf to vagrant-virtualbox, and the new VMware target is named vagrant-vmware.
 2016-08-02 10:44:29 -04:00
Graham Mainwaring 951d8e1555 Check that venv is activated before loading wsgi app (#3148) 
Check that venv is activated before loading wsgi app
 2016-07-28 10:31:29 -04:00
Graham Mainwaring 30ed7b487b Merge pull request #3112 from ghjm/scl_install_rhel_rhsm 
Enable software collections repo on RHEL 6 + RHSM
 2016-07-25 12:22:35 -04:00
Graham Mainwaring 8ed69d1641 Additional UI/JS licenses (#2974) 
* Additional UI/JS licenses
 2016-07-14 15:34:16 -04:00
Graham Mainwaring f998e467ff Merge pull request #2782 from ghjm/cffi_whl_fix 
Build cffi from source during make requirements
 2016-07-05 12:36:40 -04:00
Graham Mainwaring 3bdc50dca6 Merge pull request #2741 from ghjm/httpd_upgrade_fix 
Fix upgrade failure stopping httpd
 2016-07-01 13:35:53 -04:00
Graham Mainwaring 111511c680 Merge pull request #2612 from ghjm/centos_scl 
Correct handling of SCL repos per CentOS version
 2016-06-23 17:12:49 -04:00
Graham Mainwaring 8110708043 Merge pull request #2613 from ghjm/ol_repo_fix_2 
Use Oracle SCL only from preinstalled repo file
 2016-06-23 17:12:42 -04:00
Graham Mainwaring f97a03994c Merge pull request #2609 from ghjm/ol_scl_fix 
Enable Oracle SCL repo on OL6
 2016-06-23 14:22:13 -04:00
Graham Mainwaring 7eb6fafd72 Merge pull request #2586 from ghjm/oracle_linux_bundle_setup 
Add Oracle Linux support
 2016-06-22 16:13:39 -04:00
Graham Mainwaring a1b69383e0 Merge pull request #2549 from ghjm/setup_bundle_check 
Bundle installer fixes
 2016-06-21 16:01:17 -04:00
Graham Mainwaring e413e340e9 Merge pull request #2436 from ghjm/preflight_passwords_fix 
Fixed preflight for the new empty passwords inventory
 2016-06-15 17:32:30 -04:00
Graham Mainwaring 387a487325 Merge pull request #2365 from ghjm/preflight_passwords 
Add preflight check that password is set on fresh install
 2016-06-14 10:56:35 -04:00
Graham Mainwaring 850455efe0 Merge pull request #2356 from ghjm/el6_tower_bundle 
Build EL6 bundle correctly for SCL
 2016-06-13 14:31:56 -04:00
Graham Mainwaring ac8b8dbfb6 Fix Openstack inventory on Ubuntu 12 (#2318) 
* Update setuptools and pip when creating venvs
 2016-06-10 09:21:41 -07:00
Graham Mainwaring 8319877a43 Merge pull request #2217 from ghjm/vagrant_atlas 
Update web site Vagrant instructions
 2016-06-07 14:09:54 -07:00
Graham Mainwaring 9b64d0f635 Merge pull request #2191 from ghjm/ansible_tower_service_httpd 
Update setup on EL6 so we control the correct httpd service
 2016-06-07 09:24:14 -07:00
Graham Mainwaring 51dc42af2f Merge pull request #2054 from ghjm/release_3.0.0 
Use correct PYTHONPATH when calling Ansible
 2016-05-25 18:01:33 -04:00
Graham Mainwaring cb6b57aa75 Merge pull request #2003 from ghjm/bytecompile_fixes 
Pick the correct interpreter when bytecompiling
 2016-05-20 16:00:33 -04:00
Graham Mainwaring d21a29e404 Merge pull request #1978 from ghjm/remove_oracle_workaround 
Remove OL6 yum workaround
 2016-05-20 15:53:06 -04:00
Graham Mainwaring 84aa762135 Merge pull request #1948 from ghjm/remove-source-fix 
Properly remove Tower source from RPM builds
 2016-05-18 13:39:02 -04:00
Graham Mainwaring e76e91f83d Merge pull request #1850 from ghjm/venv_fixes 
RPM build fixes
 2016-05-06 17:11:08 -04:00
Graham Mainwaring 3170c1b8b8 Merge pull request #1828 from ghjm/scl_tower_obsoletes_non_scl_tower 
Fixes error when upgrading from 2.x (non-SCL) package on EL6
 2016-05-06 10:23:44 -04:00
Graham Mainwaring a9cc4a0d2b Merge pull request #1827 from ghjm/tower_venv_fix 
Ansible virtualenv should be created outside the SCL
 2016-05-05 17:22:48 -04:00
Graham Mainwaring 8787dcb89b Merge pull request #1824 from ghjm/tower_venv_fix 
Fix error in spec file
 2016-05-05 16:56:43 -04:00
Graham Mainwaring 31a48d5c31 Merge pull request #1569 from ghjm/ansible_26_venv 
Use system Python interpreter rather than SCL Python for Ansible venv
 2016-05-04 15:50:30 -04:00
Graham Mainwaring 72b80457eb Merge pull request #1718 from ghjm/supervisord_hang 
Fixes systemctl/supervisord hang on first boot
 2016-04-28 10:58:56 -04:00
Graham Mainwaring c3c64510a4 Merge pull request #1611 from ghjm/fix_reprepro_245 
Only export changed targets in reprepro
 2016-04-20 10:35:56 -04:00
Graham Mainwaring fdc6eb30f9 Merge pull request #1458 from ghjm/rpm_packaging 
Remove temporary folder before packaging
 2016-04-10 16:10:45 -04:00
Graham Mainwaring 7d19f7cc0e Merge pull request #1443 from ghjm/ol6_workaround_2 
More robust method for working around OL6 yum issue.
 2016-04-08 13:06:40 -04:00
Graham Mainwaring a6acb5181a Merge pull request #1417 from ansible/python27_el6 
EL6 Python 2.7 and Tower virtualenvs
 2016-04-06 10:57:18 -04:00
Graham Mainwaring 2f00260f47 Merge pull request #1076 from ghjm/ami_centos 
Update base AMI to use CentOS rather than Ubuntu
 2016-03-01 10:12:06 -05:00
Graham Mainwaring f93a1ffab9 Merge pull request #678 from ghjm/oracle_linux 
Add installer support for Oracle Linux 6 and 7
 2016-01-28 11:26:17 -05:00
Graham Mainwaring af4b4e280d Merge pull request #644 from ghjm/pycompile_rpm 
Don't break RPM build on pycompile errors
 2016-01-19 14:08:47 -05:00
Graham Mainwaring a06838166d Merge pull request #580 from ghjm/devel 
Remove update of setuptools
 2016-01-05 17:30:47 -05:00