External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-06 17:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #627 from wwitzel3/devel

Browse Source 
Fix image_build
This commit is contained in:
Wayne Witzel III
2017-11-14 08:53:21 -05:00
committed by GitHub
parent 3cdeb446c4 d696f6c3f6
commit 9ed2a0da8f
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/settings/defaults.py
View File

@@ -71,7 +71,7 @@ DATABASES = {
# timezone as the operating system. # timezone as the operating system.
# If running in a Windows environment this must be set to the same as your # If running in a Windows environment this must be set to the same as your
# system time zone. # system time zone.
TIME_ZONE = None TIME_ZONE = 'UTC'
# Language code for this installation. All choices can be found here: # Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html # http://www.i18nguy.com/unicode/language-identifiers.html
@@ -213,11 +213,11 @@ TEMPLATES = [
'social_django.context_processors.backends', 'social_django.context_processors.backends',
'social_django.context_processors.login_redirect', 'social_django.context_processors.login_redirect',
], ],
'loaders': [ 'loaders': [(
'django.template.loaders.cached.Loader', 'django.template.loaders.cached.Loader',
'django.template.loaders.filesystem.Loader', ('django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader', 'django.template.loaders.app_directories.Loader',),
], )],
}, },
'DIRS': [ 'DIRS': [
os.path.join(BASE_DIR, 'templates'), os.path.join(BASE_DIR, 'templates'),
@@ -232,7 +232,6 @@ MIDDLEWARE_CLASSES = ( # NOQA
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware',
'awx.main.middleware.ActivityStreamMiddleware', 'awx.main.middleware.ActivityStreamMiddleware',
'awx.sso.middleware.SocialAuthMiddleware', 'awx.sso.middleware.SocialAuthMiddleware',
'crum.CurrentRequestUserMiddleware', 'crum.CurrentRequestUserMiddleware',

4
installer/image_build/files/supervisor_task.conf
View File

@@ -4,7 +4,7 @@ umask = 022
[program:celery] [program:celery]
# TODO: Needs to be reworked to dynamically use instance group queues # TODO: Needs to be reworked to dynamically use instance group queues
command = awx-manage celery worker -l debug --autoscale=4 -Ofair -Q tower_scheduler,tower_broadcast_all,tower,%(host_node_name)s -n celery@localhost command = /var/lib/awx/venv/awx/bin/celery worker -A awx -l debug --autoscale=4 -Ofair -Q tower_scheduler,tower_broadcast_all,tower,%(host_node_name)s -n celery@localhost
directory = /var/lib/awx directory = /var/lib/awx
environment = LANGUAGE="en_US.UTF-8",LANG="en_US.UTF-8",LC_ALL="en_US.UTF-8",LC_CTYPE="en_US.UTF-8" environment = LANGUAGE="en_US.UTF-8",LANG="en_US.UTF-8",LC_ALL="en_US.UTF-8",LC_CTYPE="en_US.UTF-8"
#user = {{ aw_user }} #user = {{ aw_user }}
@@ -17,7 +17,7 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
[program:awx-celeryd-beat] [program:awx-celeryd-beat]
command = /usr/bin/awx-manage celery beat -l debug --pidfile= -s /var/lib/awx/beat.db command = /var/lib/awx/venv/awx/bin/celery beat -A awx -l debug --pidfile= -s /var/lib/awx/beat.db
directory = /var/lib/awx directory = /var/lib/awx
autostart = true autostart = true
autorestart = true autorestart = true