Merge branch 'expunge-awx-unstable'

.gitignore

@@ -11,6 +11,7 @@ awx/ui/static/js/local_config.js
 awx/ui/static/css/awx.min.css
 awx/main/fixtures
 awx/tower_warnings.log
+tower/tower_warnings.log
 celerybeat-schedule
 
 # Python & setuptools

awx/main/management/commands/run_socketio_service.py

@@ -110,10 +110,10 @@ class Command(NoArgsCommand):
         socketio_notification_port = settings.SOCKETIO_NOTIFICATION_PORT
 
         try:
-            if os.path.exists('/etc/awx/awx.cert') and os.path.exists('/etc/awx/awx.key'):
+            if os.path.exists('/etc/tower/awx.cert') and os.path.exists('/etc/tower/awx.key'):
                 print 'Listening on port https://0.0.0.0:' + str(socketio_listen_port)
                 server = SocketIOServer(('0.0.0.0', socketio_listen_port), TowerSocket(), resource='socket.io',
-                                        keyfile='/etc/awx/awx.key', certfile='/etc/awx/awx.cert')
+                                        keyfile='/etc/tower/awx.key', certfile='/etc/tower/awx.cert')
             else:
                 print 'Listening on port http://0.0.0.0:' + str(socketio_listen_port)
                 server = SocketIOServer(('0.0.0.0', socketio_listen_port), TowerSocket(), resource='socket.io')

awx/settings/development.py

@@ -47,8 +47,8 @@ if 'django_jenkins' in INSTALLED_APPS:
     JSHINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/js'),
                             os.path.join(BASE_DIR, 'ui/static/lib/ansible'),]
 
-# If there is an `/etc/awx/settings.py`, include it.
+# If there is an `/etc/tower/settings.py`, include it.
-include(optional('/etc/awx/settings.py'), scope=locals())
+include(optional('/etc/tower/settings.py'), scope=locals())
 
 # If any local_*.py files are present in awx/settings/, use them to override
 # default settings for development.  If not present, we can still run using

awx/settings/production.py

@@ -32,7 +32,7 @@ SECRET_KEY = None
 ALLOWED_HOSTS = []
 
 # Production should only use minified JS for UI.
-USE_MINIFIED_JS = True 
+USE_MINIFIED_JS = True
 
 # URL used by inventory script and callback plugin to access API.
 INTERNAL_API_URL = 'http://127.0.0.1:80'
@@ -48,24 +48,24 @@ LOGGING['handlers']['rotating_file'] = {
     'level': 'WARNING',
     'class':'logging.handlers.RotatingFileHandler',
     'filters': ['require_debug_false'],
-    'filename': '/var/log/awx/tower_warnings.log',
+    'filename': '/var/log/tower/tower_warnings.log',
     'maxBytes': 1024*1024*5, # 5 MB
     'backupCount': 5,
     'formatter':'simple',
 }
 
 # Load settings from any .py files in the global conf.d directory specified in
-# the environment, defaulting to /etc/awx/conf.d/.
+# the environment, defaulting to /etc/tower/conf.d/.
-settings_dir = os.environ.get('AWX_SETTINGS_DIR', '/etc/awx/conf.d/')
+settings_dir = os.environ.get('AWX_SETTINGS_DIR', '/etc/tower/conf.d/')
 settings_files = os.path.join(settings_dir, '*.py')
 
 # Load remaining settings from the global settings file specified in the
-# environment, defaulting to /etc/awx/settings.py.
+# environment, defaulting to /etc/tower/settings.py.
 settings_file = os.environ.get('AWX_SETTINGS_FILE',
-                               '/etc/awx/settings.py')
+                               '/etc/tower/settings.py')
 
-# Attempt to load settings from /etc/awx/settings.py first, followed by
+# Attempt to load settings from /etc/tower/settings.py first, followed by
-# /etc/awx/conf.d/*.py.
+# /etc/tower/conf.d/*.py.
 try:
     include(
         settings_file,
@@ -81,7 +81,7 @@ except IOError:
     if (not included_file or included_file == settings_file):
         # The import doesn't always give permission denied, so try to open the
         # settings file directly.
-        try: 
+        try:
             e = None
             open(settings_file)
         except IOError, e:

config/awx-httpd-443.conf

@@ -7,8 +7,8 @@ WSGISocketPrefix /var/run/wsgi
   ServerAlias *
   DocumentRoot /var/lib/awx/public
   SSLEngine on
-  SSLCertificateFile /etc/awx/awx.cert
+  SSLCertificateFile /etc/tower/awx.cert
-  SSLCertificateKeyFile /etc/awx/awx.key
+  SSLCertificateKeyFile /etc/tower/awx.key
 
   WSGIScriptAlias / /var/lib/awx/wsgi.py
   WSGIPassAuthorization On

setup.py

@@ -13,7 +13,7 @@ from awx import __version__
 build_timestamp = os.getenv("BUILD",datetime.datetime.now().strftime('-%Y%m%d%H%M'))
 
 # Paths we'll use later
-etcpath = "/etc/awx"
+etcpath = "/etc/tower"
 homedir = "/var/lib/awx"
 sharedir = "/usr/share/awx"
 munin_plugin_path = "/etc/munin/plugins/"