Merge pull request #292 from 3scale/allow-customizing-env-vars

allow exposing more environment variables

CHANGELOG.md

@@ -9,10 +9,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - Use per request configuration when cache is disabled [PR #289](https://github.com/3scale/apicast/pull/289)
+- Automatically expose all environment variables starting with `APICAST_` or `THREESCALE_` to nginx [PR #292](https://github.com/3scale/apicast/pull/292)
 
 ### Added
 
 - Backend HTTP client that uses cosockets [PR #295](https://github.com/3scale/apicast/pull/295)
+- Ability to customize main section of nginx configuration (and expose more env variables) [PR #292](https://github.com/3scale/apicast/pull/292)
 
 ### Removed
 

apicast/bin/apicast

@@ -110,6 +110,7 @@ done
 
 main+=("daemon ${daemon};")
 main+=("worker_processes ${worker_processes};")
+main+=$(printenv | awk '$1 ~ /^(APICAST|THREESCALE)_/ {split($0,env,"="); print "env", env[1] ";"}')
 
 function join_by { local IFS="$1"; shift; echo "$*"; }
 args=$(join_by '' "${args[@]}")

apicast/conf/nginx.conf

@@ -1,19 +1,9 @@
-env THREESCALE_DEPLOYMENT_ENV;
-env THREESCALE_PORTAL_ENDPOINT;
-env THREESCALE_CONFIG_FILE;
-env APICAST_CUSTOM_CONFIG;
-env APICAST_PATH_ROUTING_ENABLED;
-env APICAST_SERVICES;
 env REDIS_HOST;
 env REDIS_PORT;
 env RESOLVER;
-env APICAST_MODULE;
-env APICAST_RESPONSE_CODES;
-env APICAST_MANAGEMENT_API;
 env BACKEND_ENDPOINT_OVERRIDE;
 
-env APICAST_CONFIGURATION_LOADER;
-env APICAST_CONFIGURATION_CACHE;
+include ../main.d/*.conf;
 
 error_log /dev/null emerg;