From 84e2a5133747e988b897e800e8b07e0730233b75 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Fri, 12 Feb 2016 18:36:06 -0500 Subject: [PATCH] support for FORWARDED_ALLOW_IPS='*' --- bin/compile | 6 +++--- ...{python.webconcurrency.sh => python.gunicorn.sh} | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) rename vendor/{python.webconcurrency.sh => python.gunicorn.sh} (58%) diff --git a/bin/compile b/bin/compile index e8050d4..54d0381 100755 --- a/bin/compile +++ b/bin/compile @@ -103,7 +103,7 @@ BUILD_DIR=$APP_DIR # Set up outputs under new context PROFILE_PATH="$BUILD_DIR/.profile.d/python.sh" -WEBCONCURRENCY_PROFILE_PATH="$BUILD_DIR/.profile.d/python.webconcurrency.sh" +GUNICORN_PROFILE_PATH="$BUILD_DIR/.profile.d/python.gunicorn.sh" # We'll need to send these statics to other scripts we `source`. export BUILD_DIR CACHE_DIR BIN_DIR PROFILE_PATH @@ -221,8 +221,8 @@ set-default-env LANG en_US.UTF-8 set-default-env PYTHONHASHSEED random set-default-env PYTHONPATH /app/ -# Install sane-default script for WEB_CONCURRENCY environment variable. -cp $ROOT_DIR/vendor/python.webconcurrency.sh $WEBCONCURRENCY_PROFILE_PATH +# Install sane-default script for $WEB_CONCURRENCY and $FORWARDED_ALLOW_IPS. +cp $ROOT_DIR/vendor/python.gunicorn.sh $GUNICORN_PROFILE_PATH # Experimental post_compile hook. diff --git a/vendor/python.webconcurrency.sh b/vendor/python.gunicorn.sh similarity index 58% rename from vendor/python.webconcurrency.sh rename to vendor/python.gunicorn.sh index 8a33d05..e822657 100755 --- a/vendor/python.webconcurrency.sh +++ b/vendor/python.gunicorn.sh @@ -1,27 +1,32 @@ case $(ulimit -u) in -# 1X DYNO +# Automatic configuration for Gunicorn's Workers setting. + +# Standard-1X (+Free, +Hobby) Dyno 256) export DYNO_RAM=512 export WEB_CONCURRENCY=${WEB_CONCURRENCY:-2} ;; -# 2X DYNO +# Standard-2X Dyno 512) export DYNO_RAM=1024 export WEB_CONCURRENCY=${WEB_CONCURRENCY:-4} ;; -# IX DYNO +# Performance-M Dyno 16384) export DYNO_RAM=2560 export WEB_CONCURRENCY=${WEB_CONCURRENCY:-8} ;; -# PX DYNO +# Performance-L Dyno 32768) export DYNO_RAM=6656 export WEB_CONCURRENCY=${WEB_CONCURRENCY:-11} ;; esac + +# Automatic configuration for Gunicorn's ForwardedAllowIPS setting. +export FORWARDED_ALLOW_IPS='*' \ No newline at end of file