updating to remove company_site beta
This commit is contained in:
@@ -6,7 +6,6 @@
|
|||||||
# node-static -> /var/www/<env>_dta_webapp served on port.
|
# node-static -> /var/www/<env>_dta_webapp served on port.
|
||||||
host_apps:
|
host_apps:
|
||||||
- { name: company_site, env: prod, port: 8000 }
|
- { name: company_site, env: prod, port: 8000 }
|
||||||
- { name: company_site, env: beta, port: 8010 }
|
|
||||||
- { name: dta_service, env: prod, port: 8001 }
|
- { name: dta_service, env: prod, port: 8001 }
|
||||||
- { name: dta_service, env: beta, port: 8011 }
|
- { name: dta_service, env: beta, port: 8011 }
|
||||||
- { name: dta_webapp, env: prod, port: 8080 }
|
- { name: dta_webapp, env: prod, port: 8080 }
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
# can balance adama:PORT and roslin:PORT for the same workload.
|
# can balance adama:PORT and roslin:PORT for the same workload.
|
||||||
host_apps:
|
host_apps:
|
||||||
- { name: company_site, env: prod, port: 8000 }
|
- { name: company_site, env: prod, port: 8000 }
|
||||||
- { name: company_site, env: beta, port: 8010 }
|
|
||||||
- { name: dta_service, env: prod, port: 8001 }
|
- { name: dta_service, env: prod, port: 8001 }
|
||||||
- { name: dta_service, env: beta, port: 8011 }
|
- { name: dta_service, env: beta, port: 8011 }
|
||||||
- { name: dta_webapp, env: prod, port: 8080 }
|
- { name: dta_webapp, env: prod, port: 8080 }
|
||||||
|
|||||||
@@ -3,6 +3,11 @@ services:
|
|||||||
web-static:
|
web-static:
|
||||||
image: {{ web_static_image }}
|
image: {{ web_static_image }}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
logging:
|
||||||
|
driver: json-file
|
||||||
|
options:
|
||||||
|
max-size: "10m"
|
||||||
|
max-file: "3"
|
||||||
ports:
|
ports:
|
||||||
{% for a in _static_apps %}
|
{% for a in _static_apps %}
|
||||||
- "{{ a.port }}:{{ a.port }}"
|
- "{{ a.port }}:{{ a.port }}"
|
||||||
|
|||||||
@@ -1,9 +1,32 @@
|
|||||||
# Managed by Ansible (roles/web-static). Do not edit by hand.
|
# Managed by Ansible (roles/web-static). Do not edit by hand.
|
||||||
|
# Access logs: JSON to stdout for Alloy → Loki (see dta_webapp/deploy/nginx-logging.conf).
|
||||||
|
log_format observability escape=json
|
||||||
|
'{'
|
||||||
|
'"timestamp":"$time_iso8601",'
|
||||||
|
'"level":"INFO",'
|
||||||
|
'"service":"$obs_app",'
|
||||||
|
'"app":"$obs_app",'
|
||||||
|
'"env":"$obs_env",'
|
||||||
|
'"message":"$request",'
|
||||||
|
'"method":"$request_method",'
|
||||||
|
'"status":$status,'
|
||||||
|
'"bytes":$body_bytes_sent,'
|
||||||
|
'"request_time":$request_time,'
|
||||||
|
'"uri":"$request_uri",'
|
||||||
|
'"remote_addr":"$remote_addr",'
|
||||||
|
'"user_agent":"$http_user_agent"'
|
||||||
|
'}';
|
||||||
|
|
||||||
{% for a in _static_apps %}
|
{% for a in _static_apps %}
|
||||||
server {
|
server {
|
||||||
listen {{ a.port }};
|
listen {{ a.port }};
|
||||||
server_name _;
|
server_name _;
|
||||||
|
|
||||||
|
set $obs_app "{{ a.name }}";
|
||||||
|
set $obs_env "{{ a.env }}";
|
||||||
|
access_log /dev/stdout observability;
|
||||||
|
error_log /dev/stderr warn;
|
||||||
|
|
||||||
root {{ (app_catalog[a.name].webroot_pattern | default(web_static_root ~ '/{env}_' ~ a.name)) | replace('{env}', a.env) }};
|
root {{ (app_catalog[a.name].webroot_pattern | default(web_static_root ~ '/{env}_' ~ a.name)) | replace('{env}', a.env) }};
|
||||||
index index.html;
|
index index.html;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user