summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMatthew Jones <bsdmatburt@gmail.com>2017-07-26 16:58:46 +0200
committerMatthew Jones <bsdmatburt@gmail.com>2017-07-26 19:33:26 +0200
commitc7a85d9738a1e7ddd52a65968766800ed8c34d12 (patch)
treedb23bbf35ab5cbfb1832a06628dd24145d5573eb /tools
parentMerge pull request #62 from AlanCoding/log_exceptions (diff)
downloadawx-c7a85d9738a1e7ddd52a65968766800ed8c34d12.tar.xz
awx-c7a85d9738a1e7ddd52a65968766800ed8c34d12.zip
Mass rename from ansible_(awx|tower) -> (awx|tower)
Diffstat (limited to 'tools')
-rw-r--r--tools/docker-compose/Dockerfile4
-rwxr-xr-xtools/docker-compose/awx-manage6
-rw-r--r--tools/docker-compose/awx.egg-info/PKG-INFO (renamed from tools/docker-compose/ansible_awx.egg-info/PKG-INFO)8
-rw-r--r--tools/docker-compose/awx.egg-info/SOURCES.txt (renamed from tools/docker-compose/ansible_awx.egg-info/SOURCES.txt)0
-rw-r--r--tools/docker-compose/awx.egg-info/dependency_links.txt (renamed from tools/docker-compose/ansible_awx.egg-info/dependency_links.txt)0
-rw-r--r--tools/docker-compose/awx.egg-info/entry_points.txt (renamed from tools/docker-compose/ansible_awx.egg-info/entry_points.txt)0
-rw-r--r--tools/docker-compose/awx.egg-info/not-zip-safe (renamed from tools/docker-compose/ansible_awx.egg-info/not-zip-safe)0
-rw-r--r--tools/docker-compose/awx.egg-info/top_level.txt (renamed from tools/docker-compose/ansible_awx.egg-info/top_level.txt)0
-rw-r--r--tools/docker-compose/awx.egg-link (renamed from tools/docker-compose/ansible-awx.egg-link)0
-rwxr-xr-xtools/docker-compose/start_development.sh6
-rwxr-xr-xtools/docker-isolated/awx-expect2
-rwxr-xr-xtools/scripts/awx-expect2
12 files changed, 14 insertions, 14 deletions
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index b9e5298901..0a648c3d5b 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -20,9 +20,9 @@ RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa
RUN mkdir -p /data/db
RUN pip2 install honcho
RUN pip2 install supervisor
-ADD tools/docker-compose/ansible-awx.egg-link /tmp/ansible-awx.egg-link
+ADD tools/docker-compose/awx.egg-link /tmp/awx.egg-link
ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage
-ADD tools/docker-compose/ansible_awx.egg-info /tmp/ansible_awx.egg-info
+ADD tools/docker-compose/awx.egg-info /tmp/awx.egg-info
RUN ln -Ffs /awx_devel/tools/docker-compose/nginx.conf /etc/nginx/nginx.conf
RUN ln -Ffs /awx_devel/tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.default.conf
RUN ln -s /awx_devel/tools/docker-compose/start_development.sh /start_development.sh
diff --git a/tools/docker-compose/awx-manage b/tools/docker-compose/awx-manage
index b0a62494c1..65d10accf7 100755
--- a/tools/docker-compose/awx-manage
+++ b/tools/docker-compose/awx-manage
@@ -1,10 +1,10 @@
#!/venv/awx/bin/python
-# EASY-INSTALL-ENTRY-SCRIPT: 'ansible-awx','console_scripts','awx-manage'
-__requires__ = 'ansible-awx'
+# EASY-INSTALL-ENTRY-SCRIPT: 'awx','console_scripts','awx-manage'
import sys
from pkg_resources import load_entry_point
+__requires__ = 'awx'
if __name__ == '__main__':
sys.exit(
- load_entry_point('ansible-awx', 'console_scripts', 'awx-manage')()
+ load_entry_point('awx', 'console_scripts', 'awx-manage')()
)
diff --git a/tools/docker-compose/ansible_awx.egg-info/PKG-INFO b/tools/docker-compose/awx.egg-info/PKG-INFO
index eb633cdebb..d02ec5de21 100644
--- a/tools/docker-compose/ansible_awx.egg-info/PKG-INFO
+++ b/tools/docker-compose/awx.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
-Name: ansible-awx
+Name: awx
Version: placeholder
-Summary: ansible-awx: API, UI and Task Engine for Ansible
-Home-page: http://github.com/ansible/ansible-awx
+Summary: awx: API, UI and Task Engine for Ansible
+Home-page: http://github.com/ansible/awx
Author: Ansible, Inc.
Author-email: info@ansible.com
License: Proprietary
-Description: Ansible AWXprovides a web-based user interface, REST API and task engine built on top of Ansible
+Description: Ansible AWX provides a web-based user interface, REST API and task engine built on top of Ansible
Keywords: ansible
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
diff --git a/tools/docker-compose/ansible_awx.egg-info/SOURCES.txt b/tools/docker-compose/awx.egg-info/SOURCES.txt
index 1d220664e0..1d220664e0 100644
--- a/tools/docker-compose/ansible_awx.egg-info/SOURCES.txt
+++ b/tools/docker-compose/awx.egg-info/SOURCES.txt
diff --git a/tools/docker-compose/ansible_awx.egg-info/dependency_links.txt b/tools/docker-compose/awx.egg-info/dependency_links.txt
index 8b13789179..8b13789179 100644
--- a/tools/docker-compose/ansible_awx.egg-info/dependency_links.txt
+++ b/tools/docker-compose/awx.egg-info/dependency_links.txt
diff --git a/tools/docker-compose/ansible_awx.egg-info/entry_points.txt b/tools/docker-compose/awx.egg-info/entry_points.txt
index a0ad90d8ce..a0ad90d8ce 100644
--- a/tools/docker-compose/ansible_awx.egg-info/entry_points.txt
+++ b/tools/docker-compose/awx.egg-info/entry_points.txt
diff --git a/tools/docker-compose/ansible_awx.egg-info/not-zip-safe b/tools/docker-compose/awx.egg-info/not-zip-safe
index 8b13789179..8b13789179 100644
--- a/tools/docker-compose/ansible_awx.egg-info/not-zip-safe
+++ b/tools/docker-compose/awx.egg-info/not-zip-safe
diff --git a/tools/docker-compose/ansible_awx.egg-info/top_level.txt b/tools/docker-compose/awx.egg-info/top_level.txt
index d4dba9cc49..d4dba9cc49 100644
--- a/tools/docker-compose/ansible_awx.egg-info/top_level.txt
+++ b/tools/docker-compose/awx.egg-info/top_level.txt
diff --git a/tools/docker-compose/ansible-awx.egg-link b/tools/docker-compose/awx.egg-link
index bce047d354..bce047d354 100644
--- a/tools/docker-compose/ansible-awx.egg-link
+++ b/tools/docker-compose/awx.egg-link
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh
index 1892674079..9dd095aeed 100755
--- a/tools/docker-compose/start_development.sh
+++ b/tools/docker-compose/start_development.sh
@@ -21,9 +21,9 @@ else
echo "Failed to find awx source tree, map your development tree volume"
fi
-cp -R /tmp/ansible_awx.egg-info /awx_devel/ || true
-sed -i "s/placeholder/$(git describe --long | sed 's/\./\\./g')/" /awx_devel/ansible_awx.egg-info/PKG-INFO
-cp /tmp/ansible-awx.egg-link /venv/awx/lib/python2.7/site-packages/ansible-awx.egg-link
+cp -R /tmp/awx.egg-info /awx_devel/ || true
+sed -i "s/placeholder/$(git describe --long | sed 's/\./\\./g')/" /awx_devel/awx.egg-info/PKG-INFO
+cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link
ln -s /awx_devel/tools/rdb.py /venv/awx/lib/python2.7/site-packages/rdb.py || true
yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /supervisor.conf
diff --git a/tools/docker-isolated/awx-expect b/tools/docker-isolated/awx-expect
index 0ceb7a629c..bf2efb54d2 100755
--- a/tools/docker-isolated/awx-expect
+++ b/tools/docker-isolated/awx-expect
@@ -1,3 +1,3 @@
#!/bin/bash
. /venv/awx/bin/activate
-exec env TOWER_LIB_DIRECTORY=/awx_lib /awx_devel/run.py "$@"
+exec env AWX_LIB_DIRECTORY=/awx_lib /awx_devel/run.py "$@"
diff --git a/tools/scripts/awx-expect b/tools/scripts/awx-expect
index bd3364e666..23b85150b0 100755
--- a/tools/scripts/awx-expect
+++ b/tools/scripts/awx-expect
@@ -1,4 +1,4 @@
#!/bin/bash
AWX_LIB=`/var/lib/awx/venv/awx/bin/python -c 'import os, awx; print os.path.dirname(awx.__file__)'`
. /var/lib/awx/venv/awx/bin/activate
-exec env TOWER_LIB_DIRECTORY=$AWX_LIB/lib /var/lib/awx/venv/awx/bin/python $AWX_LIB/main/isolated/run.pyc "$@"
+exec env AWX_LIB_DIRECTORY=$AWX_LIB/lib /var/lib/awx/venv/awx/bin/python $AWX_LIB/main/isolated/run.pyc "$@"