diff --git a/Dockerfile b/Dockerfile index 9f5cfd8087a..eb361552a76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,8 +105,6 @@ RUN ./node_modules/.bin/bower install --allow-root --production # every time any bit of code is changed. COPY . . COPY /configuration_files/discovery_gunicorn.py ${DISCOVERY_HOME}/discovery_gunicorn.py -# deleted this file completely and defined the env variables in dockerfile's respective target images. -# COPY configuration_files/discovery_env ${DISCOVERY_HOME}/discovery_env COPY /configuration_files/discovery-workers.sh ${DISCOVERY_HOME}/discovery-workers.sh COPY /configuration_files/discovery.yml ${DISCOVERY_CFG} COPY /scripts/discovery.sh ${DISCOVERY_HOME}/discovery.sh diff --git a/configuration_files/discovery-workers.sh b/configuration_files/discovery-workers.sh index 0f90bd2d535..7f197b728f9 100644 --- a/configuration_files/discovery-workers.sh +++ b/configuration_files/discovery-workers.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash - -# Ansible managed + source /edx/app/discovery/discovery_env diff --git a/configuration_files/discovery.yml b/configuration_files/discovery.yml index 06c3814a9ef..2a4da33d0af 100644 --- a/configuration_files/discovery.yml +++ b/configuration_files/discovery.yml @@ -1,5 +1,4 @@ --- -# Ansible managed API_ROOT: null diff --git a/configuration_files/discovery_gunicorn.py b/configuration_files/discovery_gunicorn.py index 5fb7f8d6ae9..82ea4832d56 100644 --- a/configuration_files/discovery_gunicorn.py +++ b/configuration_files/discovery_gunicorn.py @@ -1,6 +1,5 @@ """ gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html -Ansible managed """ timeout = 300 @@ -11,8 +10,5 @@ limit_request_field_size = 16384 - - - def pre_request(worker, req): worker.log.info("%s %s" % (req.method, req.path)) diff --git a/configuration_files/supervisor.conf b/configuration_files/supervisor.conf index 970df44a3e8..59a864b22ee 100644 --- a/configuration_files/supervisor.conf +++ b/configuration_files/supervisor.conf @@ -1,7 +1,3 @@ -# -# Ansible managed -# - [program:nginx] command=nginx -g 'daemon off;' killasgroup=true diff --git a/scripts/devstack.sh b/scripts/devstack.sh index 013391d6102..1e57b3745ae 100644 --- a/scripts/devstack.sh +++ b/scripts/devstack.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -# Ansible managed source /edx/app/discovery/discovery_env COMMAND=$1 diff --git a/scripts/discovery.sh b/scripts/discovery.sh index 2159790b141..dd21db36303 100644 --- a/scripts/discovery.sh +++ b/scripts/discovery.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash - -# Ansible managed + export EDX_REST_API_CLIENT_NAME="default_env-default_deployment-discovery"