From 144a460ed500f22562c9bdc523489aedcedb2b87 Mon Sep 17 00:00:00 2001
From: CJ_Clippy <cj@futureporn.net>
Date: Mon, 6 Oct 2025 01:31:03 -0800
Subject: [PATCH] put env vars in docker_stack compose

---
 ansible/roles/our/tasks/filesystem.yml |  8 ++++++++
 ansible/roles/our/tasks/router.yml     |  4 ++++
 ansible/roles/our/tasks/stack.yml      | 17 ++++++++++++-----
 services/our/compose.production.yaml   |  3 ---
 4 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 ansible/roles/our/tasks/router.yml

diff --git a/ansible/roles/our/tasks/filesystem.yml b/ansible/roles/our/tasks/filesystem.yml
index 01a287a..b840a92 100644
--- a/ansible/roles/our/tasks/filesystem.yml
+++ b/ansible/roles/our/tasks/filesystem.yml
@@ -3,6 +3,13 @@
   ansible.builtin.set_fact:
     our_vfs_mount_tag: "{{ lookup('dotenv', 'VULTR_VFS_MOUNT_TAG', file='../../../../.env.production') }}"
 
+- name: Check if /mnt/vfs is already mounted
+  ansible.builtin.command: findmnt -n /mnt/vfs
+  register: our_vfs_mounted
+  ignore_errors: true
+  changed_when: false
+
+# there's a bug. we dont want to run this unless needed. https://gitlab.com/virtio-fs/virtiofsd/-/issues/213
 - name: Mount VFS
   ansible.posix.mount:
     src: "{{ our_vfs_mount_tag }}"
@@ -10,3 +17,4 @@
     fstype: virtiofs
     opts: defaults,_netdev
     state: mounted
+  when: our_vfs_mounted.rc != 0
diff --git a/ansible/roles/our/tasks/router.yml b/ansible/roles/our/tasks/router.yml
new file mode 100644
index 0000000..4c7f504
--- /dev/null
+++ b/ansible/roles/our/tasks/router.yml
@@ -0,0 +1,4 @@
+---
+# router.yml
+# here we make changes to the load balancer app routing
+
diff --git a/ansible/roles/our/tasks/stack.yml b/ansible/roles/our/tasks/stack.yml
index 1d4fb40..e2d2b50 100644
--- a/ansible/roles/our/tasks/stack.yml
+++ b/ansible/roles/our/tasks/stack.yml
@@ -5,11 +5,11 @@
     state: directory
     mode: "0755"
 
-- name: Copy env file
-  ansible.builtin.copy:
-    src: ../../../../.env.production
-    dest: /etc/futureporn/our/.env
-    mode: "0600"
+# - name: Copy env file
+#   ansible.builtin.copy:
+#     src: ../../../../.env.production
+#     dest: /etc/futureporn/our/.env
+#     mode: "0600"
 
 - name: Clone the latest code
   ansible.builtin.git:
@@ -46,6 +46,13 @@
     compose:
       - /etc/futureporn/our/compose.production.yaml
       - /etc/futureporn/our/compose.green.yaml
+      - services:
+          worker:
+            environment:
+              DATABASE_URL: "{{ lookup('dotenv', 'DATABASE_URL', file='../../../../.env.production') }}"
+          server:
+            environment:
+              DATABASE_URL: "{{ lookup('dotenv', 'DATABASE_URL', file='../../../../.env.production') }}"
 
 - name: Deploy stack to blue
   community.docker.docker_stack:
diff --git a/services/our/compose.production.yaml b/services/our/compose.production.yaml
index f60dd6f..b53ae8b 100644
--- a/services/our/compose.production.yaml
+++ b/services/our/compose.production.yaml
@@ -1,7 +1,6 @@
 services:
   server:
     image: gitea.futureporn.net/futureporn/our:latest
-    env_file: ./.env
     depends_on:
       - postgres
     init: true
@@ -13,7 +12,6 @@ services:
 
   worker:
     image: gitea.futureporn.net/futureporn/our:latest
-    env_file: ./.env
     depends_on:
       - postgres
     init: true
@@ -38,7 +36,6 @@ services:
 
   qbittorrent:
     image: gitea.futureporn.net/futureporn/qbittorrent-nox:latest
-    env_file: ./.env
     init: false
     volumes:
       - /mnt/vfs/futureporn:/mnt/vfs/futureporn