corrected license agreement env variable for ts

This commit is contained in:
2026-03-20 14:12:11 -06:00
parent abcd702d40
commit b832ab51ac
4 changed files with 19 additions and 36 deletions

View File

@@ -9,29 +9,10 @@ ansible-playbook deploy_matrix.yml -i inventory/hosts.yml --check --diff
## Deploy ## ## Deploy ##
``` ```
ansible-playbook secure.yml -i inventory/hosts.yml --check --diff ansible-playbook secure.yml -i inventory/hosts.yml
``` ```
``` ```
ansible-playbook deploy_matrix.yml -i inventory/hosts.yml --check --diff ansible-playbook deploy_matrix.yml -i inventory/hosts.yml
``` ```
```
ansible-galaxy collection install containers.podman
```
```
ssh-keygen -t ed25519 -C "matrix-deploy"
# Press Enter to save default: ~/.ssh/id_ed25519
```
```
ssh-copy-id deploy@matrix.example.com
# Replace with your actual server IP/hostname & user
```
## Deployment ##
```
# Just re-run (idempotent):
ansible-playbook playbook.yml -i inventory/hosts.yml --ask-become-pass
# Or re-run only nginx role (if you changed site/Nginx)
ansible-playbook playbook.yml --tags nginx-proxy --ask-vault-pass
```

View File

@@ -96,8 +96,8 @@
- name: Render landing page index.html - name: Render landing page index.html
ansible.builtin.template: ansible.builtin.template:
src: landing.html.j2 # path relative to this playbook file src: landing.html.j2
dest: "{{ nginx_html_path }}" # we already defined this variable in vars.yml dest: "{{ nginx_html_path }}"
mode: "0644" mode: "0644"
- name: Render Synapse Secret key - name: Render Synapse Secret key
@@ -178,9 +178,9 @@
volumes: volumes:
- "{{ vol_synapse }}:/data" - "{{ vol_synapse }}:/data"
- "{{ vol_media }}:/data/media_store" - "{{ vol_media }}:/data/media_store"
- "{{ synapse_cfg_path }}:/data/homeserver.yaml:ro:Z" - "{{ synapse_cfg_path }}:/data/homeserver.yaml:Z"
- "{{ synapse_secret_key_path }}:/data/my.matrix.host.signing.key:ro:Z" - "{{ synapse_secret_key_path }}:/data/my.matrix.host.signing.key:Z"
- "{{ synapse_log_config }}:/data/matrix.fpov.space.log.config:ro:Z" - "{{ synapse_log_config }}:/data/matrix.fpov.space.log.config:Z"
network: "{{ podman_network }}" network: "{{ podman_network }}"
restart_policy: always restart_policy: always
@@ -204,6 +204,8 @@
containers.podman.podman_container: containers.podman.podman_container:
name: "{{ teamspeak_container_name }}" name: "{{ teamspeak_container_name }}"
image: "{{ teamspeak_image }}" image: "{{ teamspeak_image }}"
env:
TSSERVER_LICENSE_ACCEPTED: 1
state: started state: started
ports: ports:
# UDP voice port – exposed directly on the host (no Traefik) # UDP voice port – exposed directly on the host (no Traefik)

View File

@@ -22,15 +22,6 @@ turn_uris:
turn_shared_secret: "{{ turn_secret }}" turn_shared_secret: "{{ turn_secret }}"
turn_user_lifetime: "86400000" # 1 day in ms (optional) turn_user_lifetime: "86400000" # 1 day in ms (optional)
# -----------------------------------------------------------------
# NEW – Google OIDC provider
# -----------------------------------------------------------------
oidc_providers:
- idp_id: google
issuer: "https://accounts.google.com"
client_id: "{{ google_oidc_client_id }}"
client_secret: "{{ google_oidc_client_secret }}"
scopes: {{ google_oidc_scopes | to_nice_yaml | indent(6) }}
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Database provider # Database provider

View File

@@ -81,5 +81,14 @@ google_oidc_scopes:
- email - email
- profile - profile
# --------------------------------------------------------------
# Landing page HTML
# --------------------------------------------------------------
matrix_domain: "matrix.example.com"
landing_title: "Welcome to {{ matrix_domain }}" # you can embed other vars here
landing_tagline: "Matrix + Traefik + Teamspeak – all in one stack"
landing_message: |
This host runs a Matrix homeserver (Synapse), a reverse-proxy (Traefik) with
automatic Let’s Encrypt certificates, a TURN server for voice/video, and a
simple landing page.