fix quote issue
Some checks are pending
fp/our CI/CD / build (push) Waiting to run
ci / test (push) Waiting to run

This commit is contained in:
CJ_Clippy 2025-10-08 10:57:56 -08:00
parent dd44232b24
commit 7c95e0d0a0
5 changed files with 48 additions and 6 deletions

View File

@ -8,6 +8,10 @@
ansible.builtin.include_tasks:
file: filesystem.yml
- name: Configure tailscale
ansible.builtin.include_tasks:
file: tailscale.yml
- name: Configure docker stack app
ansible.builtin.include_tasks:
file: stack.yml

View File

@ -39,8 +39,8 @@
compose:
- /etc/futureporn/our/compose.production.yaml
- services:
environment:
server:
server:
environment:
DATABASE_URL: "{{ lookup('dotenv', 'DATABASE_URL', file='../../../../.env.production') }}"
NODE_ENV: "{{ lookup('dotenv', 'NODE_ENV', file='../../../../.env.production') }}"
ORIGIN: "{{ lookup('dotenv', 'ORIGIN', file='../../../../.env.production') }}"
@ -63,7 +63,8 @@
SEEDBOX_SFTP_URL: "{{ lookup('dotenv', 'SEEDBOX_SFTP_URL', file='../../../../.env.production') }}"
SEEDBOX_SFTP_USERNAME: "{{ lookup('dotenv', 'SEEDBOX_SFTP_USERNAME', file='../../../../.env.production') }}"
SEEDBOX_SFTP_PASSWORD: "{{ lookup('dotenv', 'SEEDBOX_SFTP_PASSWORD', file='../../../../.env.production') }}"
worker:
worker:
environment:
DATABASE_URL: "{{ lookup('dotenv', 'DATABASE_URL', file='../../../../.env.production') }}"
NODE_ENV: "{{ lookup('dotenv', 'NODE_ENV', file='../../../../.env.production') }}"
ORIGIN: "{{ lookup('dotenv', 'ORIGIN', file='../../../../.env.production') }}"
@ -86,8 +87,10 @@
SEEDBOX_SFTP_URL: "{{ lookup('dotenv', 'SEEDBOX_SFTP_URL', file='../../../../.env.production') }}"
SEEDBOX_SFTP_USERNAME: "{{ lookup('dotenv', 'SEEDBOX_SFTP_USERNAME', file='../../../../.env.production') }}"
SEEDBOX_SFTP_PASSWORD: "{{ lookup('dotenv', 'SEEDBOX_SFTP_PASSWORD', file='../../../../.env.production') }}"
pgadmin:
pgadmin:
environment:
PGADMIN_DEFAULT_EMAIL: "{{ lookup('dotenv', 'PGADMIN_DEFAULT_EMAIL', file='../../../../.env.production') }}"
PGADMIN_DEFAULT_PASSWORD: "{{ lookup('dotenv', 'PGADMIN_DEFAULT_PASSWORD', file='../../../../.env.production') }}"
tailscale-pgadmin:
tailscale-pgadmin:
environment:
TS_AUTHKEY: "{{ lookup('dotenv', 'TS_AUTHKEY', file='../../../../.env.production') }}"

View File

@ -0,0 +1,16 @@
---
- name: Ensure Tailscale directories exist with proper permissions
ansible.builtin.file:
path: "/mnt/vfs/futureporn/tailscale/{{ item }}"
state: directory
mode: "0755"
recurse: true
loop:
- config
- state
- name: Render tailscale template
ansible.builtin.template:
mode: "0755"
src: tailscale-pgadmin.json.j2
dest: /mnt/vfs/futureporn/tailscale/tailscale-pgadmin.json

View File

@ -0,0 +1,19 @@
{
"TCP": {
"443": {
"HTTPS": true
}
},
"Web": {
"${TS_CERT_DOMAIN}:443": {
"Handlers": {
"/": {
"Proxy": "http://127.0.0.1:5050"
}
}
}
},
"AllowFunnel": {
"${TS_CERT_DOMAIN}:443": false
}
}

View File

@ -81,7 +81,7 @@ services:
- net_admin
restart: unless-stopped
environment:
TS_EXTRA_ARGS: --advertise-tags=tag:container --reset"
TS_EXTRA_ARGS: "--advertise-tags=tag:container --reset"
TS_SERVE_CONFIG: /config/pgadmin.json
TS_STATE_DIR: /var/lib/tailscale
TS_USERSPACE: "false"