Allow internal servers to have different listen configs.

For when egress is on separate server.
NREL · Sep 29, 2023 · c8b12f9 · c8b12f9
1 parent 7c4e422
commit c8b12f9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/config/schema.cue b/config/schema.cue
@@ -226,11 +226,19 @@ import "path"
   api_server: {
     host: string | *"127.0.0.1"
     port: uint16 | *14010
+    listen: {
+      host: string | *"127.0.0.1"
+      port: uint16 | *14010
+    }
   }
 
   web: {
     host: string | *"127.0.0.1"
     port: uint16 | *14012
+    listen: {
+      host: string | *"127.0.0.1"
+      port: uint16 | *14012
+    }
     request_timeout: uint | *30
     workers: uint | "auto" | *2
     worker_connections: uint | *8192
@@ -366,6 +374,10 @@ import "path"
   static_site: {
     host: string | *"127.0.0.1"
     port: uint16 | *14013
+    listen: {
+      host: string | *"127.0.0.1"
+      port: uint16 | *14013
+    }
     build_dir: string | *path.Join([_embedded_root_dir, "app/build/dist/example-website"])
   }
 

diff --git a/templates/etc/nginx/router.conf.etlua b/templates/etc/nginx/router.conf.etlua
@@ -198,7 +198,7 @@ http {
   }
 
   server {
-    listen <%- config["api_server"]["host"] %>:<%- config["api_server"]["port"] %> so_keepalive=<%- config["nginx"]["listen_so_keepalive"] %><% if config["nginx"]["listen_backlog"] then %> backlog=<%- config["nginx"]["listen_backlog"] %><% end %>;
+    listen <%- config["api_server"]["listen"]["host"] %>:<%- config["api_server"]["listen"]["port"] %> so_keepalive=<%- config["nginx"]["listen_so_keepalive"] %><% if config["nginx"]["listen_backlog"] then %> backlog=<%- config["nginx"]["listen_backlog"] %><% end %>;
 
     set $x_api_umbrella_request_id $http_x_api_umbrella_request_id;
 
@@ -264,7 +264,7 @@ http {
 
   <% if not config["_development_env?"] then %>
     server {
-      listen <%- config["static_site"]["host"] %>:<%- config["static_site"]["port"] %> so_keepalive=<%- config["nginx"]["listen_so_keepalive"] %><% if config["nginx"]["listen_backlog"] then %> backlog=<%- config["nginx"]["listen_backlog"] %><% end %>;
+      listen <%- config["static_site"]["listen"]["host"] %>:<%- config["static_site"]["listen"]["port"] %> so_keepalive=<%- config["nginx"]["listen_so_keepalive"] %><% if config["nginx"]["listen_backlog"] then %> backlog=<%- config["nginx"]["listen_backlog"] %><% end %>;
 
       set $x_api_umbrella_request_id $http_x_api_umbrella_request_id;
       root <%- config["static_site"]["build_dir"] %>;

diff --git a/templates/etc/nginx/web-app.conf.etlua b/templates/etc/nginx/web-app.conf.etlua
@@ -71,7 +71,7 @@ http {
   init_worker_by_lua_file '<%- config["_src_root_dir"] %>/src/api-umbrella/web-app/hooks/init_worker.lua';
 
   server {
-    listen <%- config["web"]["host"] %>:<%- config["web"]["port"] %> so_keepalive=<%- config["web"]["listen_so_keepalive"] %><% if config["web"]["listen_backlog"] then %> backlog=<%- config["web"]["listen_backlog"] %><% end %>;
+    listen <%- config["web"]["listen"]["host"] %>:<%- config["web"]["listen"]["port"] %> so_keepalive=<%- config["web"]["listen_so_keepalive"] %><% if config["web"]["listen_backlog"] then %> backlog=<%- config["web"]["listen_backlog"] %><% end %>;
 
     set $x_api_umbrella_request_id $http_x_api_umbrella_request_id;