fix quote issue
This commit is contained in:
parent
dd44232b24
commit
7c95e0d0a0
@ -8,6 +8,10 @@
|
|||||||
ansible.builtin.include_tasks:
|
ansible.builtin.include_tasks:
|
||||||
file: filesystem.yml
|
file: filesystem.yml
|
||||||
|
|
||||||
|
- name: Configure tailscale
|
||||||
|
ansible.builtin.include_tasks:
|
||||||
|
file: tailscale.yml
|
||||||
|
|
||||||
- name: Configure docker stack app
|
- name: Configure docker stack app
|
||||||
ansible.builtin.include_tasks:
|
ansible.builtin.include_tasks:
|
||||||
file: stack.yml
|
file: stack.yml
|
||||||
|
@ -39,8 +39,8 @@
|
|||||||
compose:
|
compose:
|
||||||
- /etc/futureporn/our/compose.production.yaml
|
- /etc/futureporn/our/compose.production.yaml
|
||||||
- services:
|
- services:
|
||||||
environment:
|
|
||||||
server:
|
server:
|
||||||
|
environment:
|
||||||
DATABASE_URL: "{{ lookup('dotenv', 'DATABASE_URL', file='../../../../.env.production') }}"
|
DATABASE_URL: "{{ lookup('dotenv', 'DATABASE_URL', file='../../../../.env.production') }}"
|
||||||
NODE_ENV: "{{ lookup('dotenv', 'NODE_ENV', file='../../../../.env.production') }}"
|
NODE_ENV: "{{ lookup('dotenv', 'NODE_ENV', file='../../../../.env.production') }}"
|
||||||
ORIGIN: "{{ lookup('dotenv', 'ORIGIN', file='../../../../.env.production') }}"
|
ORIGIN: "{{ lookup('dotenv', 'ORIGIN', file='../../../../.env.production') }}"
|
||||||
@ -64,6 +64,7 @@
|
|||||||
SEEDBOX_SFTP_USERNAME: "{{ lookup('dotenv', 'SEEDBOX_SFTP_USERNAME', 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') }}"
|
SEEDBOX_SFTP_PASSWORD: "{{ lookup('dotenv', 'SEEDBOX_SFTP_PASSWORD', file='../../../../.env.production') }}"
|
||||||
worker:
|
worker:
|
||||||
|
environment:
|
||||||
DATABASE_URL: "{{ lookup('dotenv', 'DATABASE_URL', file='../../../../.env.production') }}"
|
DATABASE_URL: "{{ lookup('dotenv', 'DATABASE_URL', file='../../../../.env.production') }}"
|
||||||
NODE_ENV: "{{ lookup('dotenv', 'NODE_ENV', file='../../../../.env.production') }}"
|
NODE_ENV: "{{ lookup('dotenv', 'NODE_ENV', file='../../../../.env.production') }}"
|
||||||
ORIGIN: "{{ lookup('dotenv', 'ORIGIN', file='../../../../.env.production') }}"
|
ORIGIN: "{{ lookup('dotenv', 'ORIGIN', file='../../../../.env.production') }}"
|
||||||
@ -87,7 +88,9 @@
|
|||||||
SEEDBOX_SFTP_USERNAME: "{{ lookup('dotenv', 'SEEDBOX_SFTP_USERNAME', 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') }}"
|
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_EMAIL: "{{ lookup('dotenv', 'PGADMIN_DEFAULT_EMAIL', file='../../../../.env.production') }}"
|
||||||
PGADMIN_DEFAULT_PASSWORD: "{{ lookup('dotenv', 'PGADMIN_DEFAULT_PASSWORD', 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') }}"
|
TS_AUTHKEY: "{{ lookup('dotenv', 'TS_AUTHKEY', file='../../../../.env.production') }}"
|
||||||
|
16
ansible/roles/our/tasks/tailscale.yml
Normal file
16
ansible/roles/our/tasks/tailscale.yml
Normal 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
|
19
ansible/roles/our/templates/tailscale-pgadmin.json.j2
Normal file
19
ansible/roles/our/templates/tailscale-pgadmin.json.j2
Normal 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
|
||||||
|
}
|
||||||
|
}
|
@ -81,7 +81,7 @@ services:
|
|||||||
- net_admin
|
- net_admin
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
TS_EXTRA_ARGS: --advertise-tags=tag:container --reset"
|
TS_EXTRA_ARGS: "--advertise-tags=tag:container --reset"
|
||||||
TS_SERVE_CONFIG: /config/pgadmin.json
|
TS_SERVE_CONFIG: /config/pgadmin.json
|
||||||
TS_STATE_DIR: /var/lib/tailscale
|
TS_STATE_DIR: /var/lib/tailscale
|
||||||
TS_USERSPACE: "false"
|
TS_USERSPACE: "false"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user