diff --git a/awx/ui/static/js/helpers/License.js b/awx/ui/static/js/helpers/License.js index 00915baaca..c52d83e8a3 100644 --- a/awx/ui/static/js/helpers/License.js +++ b/awx/ui/static/js/helpers/License.js @@ -573,7 +573,7 @@ function ($location, $rootScope, $compile, $filter, GenerateForm, Rest, Alert, G // The license is invalid. Stop the user from logging in. status = 'alert-danger'; hdr = 'License Error'; - msg = '
There is a problem with the /etc/awx/license file on your Tower server. Check to make sure Tower can access ' + + msg = '
There is a problem with the /etc/tower/license file on your Tower server. Check to make sure Tower can access ' + 'the file.
' + purchase_msg; Alert(hdr, msg, status, null, false, true); } else if (license.demo !== undefined && license.demo === true) { diff --git a/tools/sosreport/tower.py b/tools/sosreport/tower.py index fc5b2c3d26..5e9783c2c3 100644 --- a/tools/sosreport/tower.py +++ b/tools/sosreport/tower.py @@ -19,12 +19,12 @@ if LooseVersion(sos.__version__) >= LooseVersion('3.0'): "supervisorctl status", # tower process status "tree -d /var/lib/awx", # show me the dirs "ls -ll /var/lib/awx", # check permissions - "ls -ll /etc/awx" + "ls -ll /etc/tower" ] dirs = [ - "/etc/awx/", - "/var/log/awx", + "/etc/tower/", + "/var/log/tower", "/var/log/httpd", "/var/log/apache2", "/var/log/rabbitmq", @@ -58,12 +58,12 @@ else: "supervisorctl status", # tower process status "tree -d /var/lib/awx", # show me the dirs "ls -ll /var/lib/awx", # check permissions - "ls -ll /etc/awx" + "ls -ll /etc/tower" ] dirs = [ - "/etc/awx/", - "/var/log/awx", + "/etc/tower/", + "/var/log/tower", "/var/log/httpd", "/var/log/apache2", "/var/log/rabbitmq",