Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: Deploy Proxy
command: |
export PATH=$HOME/bin:$PATH
./bin/cf_deploy.sh fecfile-api-proxy fec-fecfile $CIRCLE_BRANCH
./bin/cf_deploy.sh load-fecfile-api-proxy fec-fecfile $CIRCLE_BRANCH

workflows:
version: 2.1
Expand Down
6 changes: 3 additions & 3 deletions bin/cf_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ cloud_gov=${CF_API:-https://api.fr.cloud.gov}
app=${1}
org=${2}
branch=${3}
web_api="fecfile-web-api"
web_api="load-fecfile-web-api"

# Get the space that corresponds with the branch name
if [[ ${branch} == "develop" ]]; then
echo "Branch is 'develop', deploying to dev space."
if [[ ${branch} == "2414-load-test-mirror" ]]; then
echo "Branch is '2414-load-test-mirror', deploying to dev space."
space="dev"
elif [[ ${branch} == release/sprint* ]]; then
echo "Branch starts with 'release/sprint', deploying to stage space."
Expand Down
6 changes: 3 additions & 3 deletions manifest_dev.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
applications:
- name: fecfile-api-proxy
- name: load-fecfile-api-proxy
instances: 2
memory: 1G
disk_quota: 1G
routes:
- route: dev-api.fecfile.fec.gov
- route: load-dev-api.app.cloud.gov
stack: cflinuxfs4
buildpacks:
- nginx_buildpack
env:
FECFILE_WEB_API: "http://fecfile-web-api-dev.apps.internal:8080"
FECFILE_WEB_API: "http://load-fecfile-web-api-dev.apps.internal:8080"
6 changes: 3 additions & 3 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ http {
gzip_types text/plain text/css text/js text/xml text/javascript application/javascript application/x-javascript application/json application/xml application/xml+rss;

tcp_nopush on;
keepalive_timeout 300;
proxy_connect_timeout 300;
proxy_read_timeout 300;
keepalive_timeout 60;
proxy_connect_timeout 60;
proxy_read_timeout 60;
# Ensure that redirects don't include the internal container PORT - {{port}}
port_in_redirect off;
server_tokens off;
Expand Down