External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-14 01:34:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_3.0.0' into devel

Browse Source 
* release_3.0.0: (270 commits)
  Inventory Manage > copy/move groups disable copy option where impossible, add to Root Group target, resolves #1749 (#2218)
  fixes access issue for InventoryScript.admin_role
  Make sure project team list is filtered for access
  Fix up the project teams list
  fix api test
  fix tests with refreshes
  adjusting Credential model and migrations
  adjusting API for new Credential.organization
  Fix Openstack inventory on Ubuntu 12 (#2318)
  Attach labels instead of erroring on creation if label already exists
  Fix system-tracking typo
  update test_rbac_api to new object_roles naming
  Fixing Credential access issue
  Fix an issue calling build_env for system jobs
  remove dead fields from Groups > Add manual source type, resovles #2288 (#2305)
  fixes regression on license expiresOn display, resolves #2277 (#2287)
  fix edit action in Jobs > Schedules tab view, resolves #2258 (#2292)
  Fixed several bugs with adding permissions where checkboxes weren't checked properly or were disappearing when paging was involved.
  specify playbook vars in a way that works with 1.9
  Change ldap and other sso defaults to remove from team/admin
  ...
This commit is contained in:
Matthew Jones
2016-06-12 22:42:42 -04:00
parent bbc84568a7
commit 22437f80ed
321 changed files with 8256 additions and 8395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
setup.py
View File

@@ -7,7 +7,6 @@ import os
import datetime
import glob
import sys
import shutil
from setuptools import setup
from awx import __version__
@@ -23,13 +22,10 @@ homedir = "/var/lib/awx"
bindir = "/usr/bin"
sharedir = "/usr/share/awx"
docdir = "/usr/share/doc/ansible-tower"
munin_plugin_path = "/etc/munin/plugins/"
munin_plugin_conf_path = "/etc/munin/plugin-conf.d"
if os.path.exists("/etc/debian_version"):
sysinit = "/etc/init.d"
webconfig = "/etc/apache2/conf.d"
shutil.copy("config/awx-munin-ubuntu.conf", "config/awx-munin.conf")
# sosreport-3.1 (and newer) look in '/usr/share/sosreport/sos/plugins'
# sosreport-3.0 looks in '/usr/lib/python2.7/dist-packages/sos/plugins'
# debian/<package>.links will create symlinks to support both versions
@@ -37,7 +33,6 @@ if os.path.exists("/etc/debian_version"):
else:
sysinit = "/etc/rc.d/init.d"
webconfig = "/etc/httpd/conf.d"
shutil.copy("config/awx-munin-el.conf", "config/awx-munin.conf")
# The .spec will create symlinks to support multiple versions of sosreport
sosconfig = "/usr/share/sosreport/sos/plugins"
@@ -120,22 +115,9 @@ setup(
("%s" % homedir, ["config/wsgi.py",
"awx/static/favicon.ico"]),
("%s" % webconfig, ["config/awx-httpd-80.conf",
"config/awx-httpd-443.conf",
"config/awx-munin.conf"]),
"config/awx-httpd-443.conf"]),
("%s" % sharedir, ["tools/scripts/request_tower_configuration.sh","tools/scripts/request_tower_configuration.ps1"]),
("%s" % docdir, ["docs/licenses/*",]),
("%s" % munin_plugin_path, ["tools/munin_monitors/tower_jobs",
"tools/munin_monitors/callbackr_alive",
"tools/munin_monitors/celery_alive",
"tools/munin_monitors/postgres_alive",
"tools/munin_monitors/redis_alive",
"tools/munin_monitors/socketio_alive",
"tools/munin_monitors/taskmanager_alive",
"tools/munin_monitors/mongo_conn",
"tools/munin_monitors/mongo_docs",
"tools/munin_monitors/mongo_mem",
"tools/munin_monitors/mongo_ops"]),
("%s" % munin_plugin_conf_path, ["config/awx_munin_tower_jobs"]),
("%s" % bindir, ["tools/scripts/ansible-tower-service",
"tools/scripts/tower-python"]),
("%s" % sosconfig, ["tools/sosreport/tower.py"])]),