Permalink
Browse files

Revert nginx config (#646)

* Revert "Add support for extra_properties in per task instructions (#593)"

This reverts commit 2b69e98.

* Revert "Override nginx timeout and request size defaults (#645)"

This reverts commit 03fd401.
  • Loading branch information...
hunt3ri committed Jun 29, 2017
1 parent 03fd401 commit 513bf5aa7d39cec6ecbabc8e9818e003a9d2f85b
Showing with 5 additions and 29 deletions.
  1. +0 −24 .ebextensions/environment.config
  2. +1 −1 Dockerfile
  3. +4 −4 requirements.aws.txt
@@ -2,27 +2,3 @@
option_settings:
- option_name: TM_ENV
value: Staging
files:
"/tmp/45_nginx_https_rw.sh":
owner: root
group: root
mode: "000755"
content: |
#! /bin/bash
CONFIGURED=`grep -c "client_max_body_size 10M;" /etc/nginx/sites-available/elasticbeanstalk-nginx-docker-proxy.conf`
if [ $CONFIGURED = 0 ]
then
sed -i "/listen 80;/a \ \ proxy_read_timeout 180;" /etc/nginx/sites-available/elasticbeanstalk-nginx-docker-proxy.conf
sed -i "/listen 80;/a \ \ client_max_body_size 10M;" /etc/nginx/sites-available/elasticbeanstalk-nginx-docker-proxy.conf
logger -t nginx_rw "https rewrite rules added"
exit 0
else
logger -t nginx_rw "https rewrite rules already set"
exit 0
fi
container_commands:
00_run_script:
command: /tmp/45_nginx_https_rw.sh
View
@@ -18,4 +18,4 @@ ADD . /src
EXPOSE 8000
# Gunicorn configured for single-core machine, if more cores available increase workers using formula ((cores x 2) + 1))
CMD cd /src; gunicorn -b 0.0.0.0:8000 -w 3 --timeout 179 manage:application
CMD cd /src; gunicorn -b 0.0.0.0:8000 -w 3 --timeout 59 manage:application
View
@@ -1,12 +1,12 @@
awsebcli==3.10.3
botocore==1.5.76
awsebcli==3.10.1
botocore==1.5.44
cement==2.8.2
colorama==0.3.7
docker-py==1.7.2
dockerpty==0.4.1
docopt==0.6.2
docutils==0.13.1
jmespath==0.9.3
jmespath==0.9.2
pathspec==0.5.0
python-dateutil==2.6.0
PyYAML==3.12
@@ -15,4 +15,4 @@ semantic-version==2.5.0
six==1.10.0
tabulate==0.7.5
termcolor==1.1.0
websocket-client==0.44.0
websocket-client==0.40.0

0 comments on commit 513bf5a

Please sign in to comment.