add nginx overrideHEADmain

3 files changed, 11 insertions, 4 deletions

diff --git a/bin/compose b/bin/compose
index 34df8fe..f8c1796 100755
--- a/bin/compose
+++ b/bin/compose
@@ -83,10 +83,10 @@ function include_docker {
 	fi
 }
 
-include_docker	"$CRIMSON_ROOT/docker/docker-compose.base.yml"  "true"
-include_docker	"$CRIMSON_ROOT/docker/docker-compose.db.yml"    "$POSTGRES_ENABLED"
-include_docker	"$CRIMSON_ROOT/docker/docker-compose.api.yml"   "$API_ENABLED"
-include_docker	"$PROJECT_ROOT/docker-compose.override.yml"     "true"
+include_docker	"$CRIMSON_ROOT/docker/docker-compose.base.yml"   "true"
+include_docker	"$CRIMSON_ROOT/docker/docker-compose.db.yml"     "$POSTGRES_ENABLED"
+include_docker	"$CRIMSON_ROOT/docker/docker-compose.api.yml"    "$API_ENABLED"
+include_docker	"$PROJECT_ROOT/conf/docker-compose.override.yml" "true"
 
 # set project name
 
diff --git a/build/nginx/entrypoint.sh b/build/nginx/entrypoint.sh
index 6dc7eec..e7d06bf 100755
--- a/build/nginx/entrypoint.sh
+++ b/build/nginx/entrypoint.sh
@@ -1,8 +1,13 @@
 #!/bin/sh
 
+## disable api if not set to "true"
 if [ ! "$API_ENABLED" = "true" ]; then
     echo "" > /etc/nginx/nginx.api.conf
     echo "" > /etc/nginx/nginx.api.server.conf
 fi
 
+## make sure override files exist as empty if not found
+touch /etc/nginx/nginx.override.conf
+touch /etc/nginx/nginx.override.server.conf
+
 exec -a /usr/sbin/nginx /usr/sbin/nginx -c /etc/nginx/nginx.conf
diff --git a/build/nginx/nginx.conf b/build/nginx/nginx.conf
index d3dc0ae..2f09165 100644
--- a/build/nginx/nginx.conf
+++ b/build/nginx/nginx.conf
@@ -18,6 +18,7 @@ http {
     access_log /var/log/nginx/access.log;
 
     include "nginx.api.conf";
+    include "nginx.override.conf";
 
     server {
         listen 8080;
@@ -32,6 +33,7 @@ http {
         gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml image/x-icon;
 
         include "nginx.api.server.conf";
+        include "nginx.override.server.conf";
 
         location /favicon.ico {
             add_header Cache-Control "public, max-age=31536000, immutable";