From 974e848d915fb4cd01033ae24391888d17a047a4 Mon Sep 17 00:00:00 2001
From: Ryan Westfall <ryan@aimloperations.com>
Date: Fri, 10 Jul 2026 12:31:32 -0500
Subject: [PATCH] updating to remove company_site beta

---
 inventory/host_vars/adama.yml                 |  1 -
 inventory/host_vars/roslin.yml                |  1 -
 .../templates/docker-compose.yml.j2           |  5 ++++
 roles/web-static/templates/nginx.conf.j2      | 23 +++++++++++++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/inventory/host_vars/adama.yml b/inventory/host_vars/adama.yml
index 143c3ee..804d87b 100644
--- a/inventory/host_vars/adama.yml
+++ b/inventory/host_vars/adama.yml
@@ -6,7 +6,6 @@
 # node-static -> /var/www/<env>_dta_webapp served on port.
 host_apps:
   - { 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: beta, port: 8011 }
   - { name: dta_webapp, env: prod, port: 8080 }
diff --git a/inventory/host_vars/roslin.yml b/inventory/host_vars/roslin.yml
index 74ce546..b574293 100644
--- a/inventory/host_vars/roslin.yml
+++ b/inventory/host_vars/roslin.yml
@@ -3,7 +3,6 @@
 # can balance adama:PORT and roslin:PORT for the same workload.
 host_apps:
   - { 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: beta, port: 8011 }
   - { name: dta_webapp, env: prod, port: 8080 }
diff --git a/roles/web-static/templates/docker-compose.yml.j2 b/roles/web-static/templates/docker-compose.yml.j2
index 65a605b..bb3ad1d 100644
--- a/roles/web-static/templates/docker-compose.yml.j2
+++ b/roles/web-static/templates/docker-compose.yml.j2
@@ -3,6 +3,11 @@ services:
   web-static:
     image: {{ web_static_image }}
     restart: unless-stopped
+    logging:
+      driver: json-file
+      options:
+        max-size: "10m"
+        max-file: "3"
     ports:
 {% for a in _static_apps %}
       - "{{ a.port }}:{{ a.port }}"
diff --git a/roles/web-static/templates/nginx.conf.j2 b/roles/web-static/templates/nginx.conf.j2
index c5ceff1..6aac44c 100644
--- a/roles/web-static/templates/nginx.conf.j2
+++ b/roles/web-static/templates/nginx.conf.j2
@@ -1,9 +1,32 @@
 # 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 %}
 server {
     listen {{ a.port }};
     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) }};
     index index.html;