From 80d21ec31ec23d5369f17f79d51c54b0e5442e04 Mon Sep 17 00:00:00 2001
From: Amritanshu <git@tanshu.com>
Date: Tue, 1 Sep 2026 02:15:01 +0000
Subject: [PATCH] Minor fixes. Logs should now show the real ip address not the
 caddy container ip.

---
 ansible/files/.env                  | 6 +++---
 ansible/roles/caddy/tasks/main.yaml | 2 +-
 ansible/vars/hin.yml                | 1 +
 barker/barker/main.py               | 2 +-
 barker/gunicorn.conf.py             | 6 ++++++
 frank/ansible/files/frank.service   | 5 +++--
 frank/worker-start.sh               | 4 ++--
 7 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/ansible/files/.env b/ansible/files/.env
index 3df44d7..eb3c6d4 100644
--- a/ansible/files/.env
+++ b/ansible/files/.env
@@ -6,9 +6,9 @@ SQLALCHEMY_DATABASE_URI=postgresql+psycopg://postgres:123456@postgres:5432/petty
 MODULE_NAME=barker.main
 PROJECT_NAME=barker
 MAX_WORKERS=4
-NATS_URL=nats://{{ nats_host }}:{{ nats_port }}
-SUBJECT="barker.print"
-STREAM="barker_print_stream"
+NATS_URL={{ nats_url }}
+SUBJECT=barker.print
+STREAM=barker_print_stream
 SECRET_KEY={{ secret_key }}
 MIDDLEWARE_SECRET_KEY={{ middleware_key }}
 ALGORITHM=HS256
diff --git a/ansible/roles/caddy/tasks/main.yaml b/ansible/roles/caddy/tasks/main.yaml
index bbaf02e..ae361a1 100644
--- a/ansible/roles/caddy/tasks/main.yaml
+++ b/ansible/roles/caddy/tasks/main.yaml
@@ -24,4 +24,4 @@
     create: true
     mode: "0644"
   when: not caddy_snippet_present
-  notify: Restart caddy container
+  notify: Reload Caddy configuration
diff --git a/ansible/vars/hin.yml b/ansible/vars/hin.yml
index aeeab7b..02949f0 100644
--- a/ansible/vars/hin.yml
+++ b/ansible/vars/hin.yml
@@ -6,3 +6,4 @@ middleware_key: c4b0b98ff9
 host: knox.mozimo.in
 host_directory: "barker-{{ app_name }}"
 docker_network: "{{ host_directory }}_net"
+nats_url: "nats://clair.lan.tanshu.com:4222"
diff --git a/barker/barker/main.py b/barker/barker/main.py
index deb818c..a1d728d 100644
--- a/barker/barker/main.py
+++ b/barker/barker/main.py
@@ -166,4 +166,4 @@ app.frontend("/", directory="frontend", check_dir="auto")
 
 
 def init() -> None:
-    uvicorn.run(app, host=settings.HOST, port=9995)
+    uvicorn.run(app, host=settings.HOST, port=settings.PORT)
diff --git a/barker/gunicorn.conf.py b/barker/gunicorn.conf.py
index e62b540..8cec710 100644
--- a/barker/gunicorn.conf.py
+++ b/barker/gunicorn.conf.py
@@ -30,6 +30,12 @@ port = os.getenv("PORT", "9995")
 bind_env = os.getenv("BIND", None)
 use_bind = bind_env if bind_env else f"{host}:{port}"
 
+# Tell Gunicorn to trust X-Forwarded-For headers from the reverse proxy
+forwarded_allow_ips = "*"
+
+# Optional: Ensure proxy protocol is recognized
+proxy_allow_ips = "*"
+
 loglevel = os.getenv("LOG_LEVEL", "info")
 accesslog_var = os.getenv("ACCESS_LOG", "-")
 accesslog = accesslog_var or None
diff --git a/frank/ansible/files/frank.service b/frank/ansible/files/frank.service
index 1d26f6b..72460a7 100644
--- a/frank/ansible/files/frank.service
+++ b/frank/ansible/files/frank.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Frank container service
-After=docker.service netbird.service
+BindsTo=dev-usb-lp0.device
+After=docker.service netbird.service dev-usb-lp0.device
 Wants=network-online.target docker.socket netbird.service
 Requires=docker.socket netbird.service
 PartOf=netbird.service
@@ -12,4 +13,4 @@ ExecStart=/usr/bin/docker start -a frank
 ExecStop=/usr/bin/docker stop -t 10 frank
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target dev-usb-lp0.device
diff --git a/frank/worker-start.sh b/frank/worker-start.sh
index 4e3156d..1993e18 100755
--- a/frank/worker-start.sh
+++ b/frank/worker-start.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
 set -e
 
-echo uv run taskiq worker worker:broker
-uv run taskiq worker worker:broker
+echo "Starting taskiq worker..."
+exec uv run taskiq worker worker:broker