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

Merge pull request #197 from ansible/fix_secret_key

Browse Source 
Fix an issue where we ignored the secret key during install
This commit is contained in:
Matthew Jones
2017-09-19 06:36:54 -07:00
committed by GitHub
parent bc4b622e6b f5ccb51ef2
commit 52aa38e742
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(): def get_secret():
if os.path.exists("/etc/tower/SECRET_KEY"): if os.path.exists("/etc/tower/SECRET_KEY"):
return file('/etc/tower/SECRET_KEY', 'rb').read().strip() return file('/etc/tower/SECRET_KEY', 'rb').read().strip()
return os.getenv("SECRET_KEY", "privateawx"), return os.getenv("SECRET_KEY", "privateawx")
ADMINS = () 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 /var/log/tower
RUN mkdir -p /etc/tower RUN mkdir -p /etc/tower
RUN echo "awxsecret" > /etc/tower/SECRET_KEY
COPY {{ awx_sdist_file }} /tmp/{{ awx_sdist_file }} COPY {{ awx_sdist_file }} /tmp/{{ awx_sdist_file }}
RUN OFFICIAL=yes pip install /tmp/{{ awx_sdist_file }} RUN OFFICIAL=yes pip install /tmp/{{ awx_sdist_file }}

6
installer/inventory
View File

@@ -44,8 +44,10 @@ pg_password=awxpass
pg_database=awx pg_database=awx
pg_port=5432 pg_port=5432
# AWX Tunables # AWX Secret key
awx_secret_key=aabbcc # It's *very* important that this stay the same between upgrades or you will use the ability to decrypt
# your credentials
awx_secret_key=awxsecret
# Proxy # Proxy
#http_proxy=http://proxy:3128 #http_proxy=http://proxy:3128

1
installer/local_docker/tasks/main.yml
View File

@@ -212,3 +212,4 @@
RABBITMQ_VHOST: "awx" RABBITMQ_VHOST: "awx"
MEMCACHED_HOST: "memcached" MEMCACHED_HOST: "memcached"
MEMCACHED_PORT: "11211" MEMCACHED_PORT: "11211"
SECRET_KEY: "{{ awx_secret_key }}"