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

Fix an issue where we ignored the secret key during install

Browse Source
This commit is contained in:
Matthew Jones
2017-09-18 15:11:04 -04:00
parent 87b58e6bc2
commit f5ccb51ef2
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/image_build/files/settings.py
View File

@@ -6,7 +6,7 @@ import os
def get_secret():
if os.path.exists("/etc/tower/SECRET_KEY"):
return file('/etc/tower/SECRET_KEY', 'rb').read().strip()
return os.getenv("SECRET_KEY", "privateawx"),
return os.getenv("SECRET_KEY", "privateawx")
ADMINS = ()

1
installer/image_build/templates/Dockerfile.j2
View File

@@ -40,7 +40,6 @@ RUN yum -y install epel-release && \
RUN mkdir -p /var/log/tower
RUN mkdir -p /etc/tower
RUN echo "awxsecret" > /etc/tower/SECRET_KEY
COPY {{ awx_sdist_file }} /tmp/{{ awx_sdist_file }}
RUN OFFICIAL=yes pip install /tmp/{{ awx_sdist_file }}