again corrected signing key location and removed extra command for synapse server
This commit is contained in:
@@ -68,6 +68,10 @@
|
|||||||
name: "{{ npm_image }}"
|
name: "{{ npm_image }}"
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
|
- name: Pull Postgres DB image
|
||||||
|
containers.podman.podman_image:
|
||||||
|
name: "{{ db_image }}"
|
||||||
|
state: present
|
||||||
|
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
# Render all configuration files from the templates
|
# Render all configuration files from the templates
|
||||||
@@ -143,41 +147,58 @@
|
|||||||
# Start containers (Traefik, TURN, Synapse, NGINX – unchanged)
|
# Start containers (Traefik, TURN, Synapse, NGINX – unchanged)
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
|
|
||||||
# - name: Start coturn container
|
- name: Start coturn container
|
||||||
# containers.podman.podman_container:
|
containers.podman.podman_container:
|
||||||
# name: turn
|
name: turn
|
||||||
# image: "{{ turn_image }}"
|
image: "{{ turn_image }}"
|
||||||
# state: started
|
state: started
|
||||||
# ports:
|
ports:
|
||||||
# - "{{ turn_listen_port }}:{{ turn_listen_port }}/udp"
|
- "{{ turn_listen_port }}:{{ turn_listen_port }}/udp"
|
||||||
# - "{{ turn_listen_port }}:{{ turn_listen_port }}/tcp"
|
- "{{ turn_listen_port }}:{{ turn_listen_port }}/tcp"
|
||||||
# - "{{ turn_tls_port }}:{{ turn_tls_port }}/udp"
|
- "{{ turn_tls_port }}:{{ turn_tls_port }}/udp"
|
||||||
# - "{{ turn_tls_port }}:{{ turn_tls_port }}/tcp"
|
- "{{ turn_tls_port }}:{{ turn_tls_port }}/tcp"
|
||||||
# volumes:
|
volumes:
|
||||||
# - "{{ vol_turn }}:/var/lib/turn"
|
- "{{ vol_turn }}:/var/lib/turn"
|
||||||
# - "{{ turn_conf_path }}:/etc/turnserver.conf:ro"
|
- "{{ turn_conf_path }}:/etc/turnserver.conf:ro"
|
||||||
# command: "-c /etc/turnserver.conf"
|
command: "-c /etc/turnserver.conf"
|
||||||
# network: "{{ podman_network }}"
|
network: "{{ podman_network }}"
|
||||||
# restart_policy: always
|
restart_policy: always
|
||||||
|
|
||||||
|
- name: Start Synapse container
|
||||||
|
containers.podman.podman_container:
|
||||||
|
name: synapse
|
||||||
|
image: "{{ synapse_image }}"
|
||||||
|
state: started
|
||||||
|
env:
|
||||||
|
SYNAPSE_POSTGRES_USER: "{{ postgres_user }}"
|
||||||
|
SYNAPSE_POSTGRES_PASSWORD: "{{ postgres_pw }}"
|
||||||
|
SYNAPSE_POSTGRES_DBNAME: "{{ postgres_db }}"
|
||||||
|
SYNAPSE_POSTGRES_HOST: synapse-db
|
||||||
|
SYNAPSE_POSTGRES_PORT: 5432
|
||||||
|
ports:
|
||||||
|
- "{{ synapse_http_port }}:{{ synapse_http_port }}"
|
||||||
|
volumes:
|
||||||
|
- "{{ vol_synapse }}:/data"
|
||||||
|
- "{{ vol_media }}:/data/media_store"
|
||||||
|
- "{{ synapse_cfg_path }}:/data/homeserver.yaml:Z"
|
||||||
|
- "{{ synapse_secret_key_path }}:/data/matrix.fpov.space.signing.key:Z"
|
||||||
|
- "{{ synapse_log_config }}:/data/matrix.fpov.space.log.config:Z"
|
||||||
|
network: "{{ podman_network }}"
|
||||||
|
restart_policy: always
|
||||||
|
- name: start Database container
|
||||||
|
containers.podman.podman_container:
|
||||||
|
name: synapse-db
|
||||||
|
image: "{{ db_image }}"
|
||||||
|
state: started
|
||||||
|
env:
|
||||||
|
POSTGRES_USER: "{{ postgres_user }}"
|
||||||
|
POSTGRES_PASSWORD: "{{ postgres_pw }}"
|
||||||
|
POSTGRES_DB: "{{ postgres_db }}"
|
||||||
|
volumes:
|
||||||
|
- "{{ vol_db }}:/var/lib/postgresql/data"
|
||||||
|
network: "{{ podman_network }}"
|
||||||
|
restart_policy: always
|
||||||
|
|
||||||
# - name: Start Synapse container
|
|
||||||
# containers.podman.podman_container:
|
|
||||||
# name: synapse
|
|
||||||
# image: "{{ synapse_image }}"
|
|
||||||
# state: started
|
|
||||||
# env:
|
|
||||||
# SYNAPSE_SERVER_NAME: "{{ matrix_domain }}"
|
|
||||||
# SYNAPSE_REPORT_STATS: "yes"
|
|
||||||
# ports:
|
|
||||||
# - "{{ synapse_http_port }}:{{ synapse_http_port }}"
|
|
||||||
# volumes:
|
|
||||||
# - "{{ vol_synapse }}:/data"
|
|
||||||
# - "{{ vol_media }}:/data/media_store"
|
|
||||||
# - "{{ synapse_cfg_path }}:/data/homeserver.yaml:Z"
|
|
||||||
# - "{{ synapse_secret_key_path }}:/data/my.matrix.host.signing.key:Z"
|
|
||||||
# - "{{ synapse_log_config }}:/data/matrix.fpov.space.log.config:Z"
|
|
||||||
# network: "{{ podman_network }}"
|
|
||||||
# restart_policy: always
|
|
||||||
|
|
||||||
# - name: Start NGINX landing-page container
|
# - name: Start NGINX landing-page container
|
||||||
# containers.podman.podman_container:
|
# containers.podman.podman_container:
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ server_name: "{{ matrix_domain }}"
|
|||||||
pid_file: /data/homeserver.pid
|
pid_file: /data/homeserver.pid
|
||||||
listeners:
|
listeners:
|
||||||
- port: {{ synapse_http_port }}
|
- port: {{ synapse_http_port }}
|
||||||
bind_addresses: ['0.0.0.0']
|
|
||||||
resources:
|
resources:
|
||||||
- compress: true
|
- compress: true
|
||||||
names:
|
names:
|
||||||
@@ -12,10 +11,8 @@ listeners:
|
|||||||
type: http
|
type: http
|
||||||
x_forwarded: true
|
x_forwarded: true
|
||||||
|
|
||||||
# -------------------------------------------------
|
turn:
|
||||||
# TURN (WebRTC) – injected from the variables above
|
uris:
|
||||||
# -------------------------------------------------
|
|
||||||
turn_uris:
|
|
||||||
- "turn:{{ matrix_domain }}:{{ turn_listen_port }}?transport=udp"
|
- "turn:{{ matrix_domain }}:{{ turn_listen_port }}?transport=udp"
|
||||||
- "turn:{{ matrix_domain }}:{{ turn_tls_port }}?transport=tcp"
|
- "turn:{{ matrix_domain }}:{{ turn_tls_port }}?transport=tcp"
|
||||||
- "turns:{{ matrix_domain }}:{{ turn_tls_port }}?transport=tcp"
|
- "turns:{{ matrix_domain }}:{{ turn_tls_port }}?transport=tcp"
|
||||||
@@ -23,19 +20,12 @@ turn_shared_secret: "{{ turn_secret }}"
|
|||||||
turn_user_lifetime: "86400000" # 1 day in ms (optional)
|
turn_user_lifetime: "86400000" # 1 day in ms (optional)
|
||||||
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------
|
|
||||||
# Database provider
|
|
||||||
#------------------------------------------------------------------
|
|
||||||
database:
|
|
||||||
name: sqlite3
|
|
||||||
args:
|
|
||||||
database: /data/homeserver.db
|
|
||||||
media_store_path: /data/media_store
|
media_store_path: /data/media_store
|
||||||
log_config: "/data/matrix.fpov.space.log.config"
|
log_config: "/data/matrix.fpov.space.log.config"
|
||||||
registration_shared_secret: "{{ registration_shared_secret }}"
|
registration_shared_secret: "{{ registration_shared_secret }}"
|
||||||
report_stats: false
|
report_stats: false
|
||||||
macaroon_secret_key: "{{ macaroon_secret_key }}
|
macaroon_secret_key: "{{ macaroon_secret_key }}"
|
||||||
form_secret: "{{ form_secret }}"
|
form_secret: "{{ form_secret }}"
|
||||||
signing_key_path: "/data/my.matrix.host.signing.key"
|
signing_key_path: "/data/matrix.fpov.space.signing.key"
|
||||||
trusted_key_servers:
|
trusted_key_servers:
|
||||||
- server_name: "{{ matrix_domain }}"
|
- server_name: "{{ matrix_domain }}"
|
||||||
|
|||||||
@@ -14,3 +14,5 @@ listening-ip=::0
|
|||||||
|
|
||||||
log-file=/var/log/turnserver.log
|
log-file=/var/log/turnserver.log
|
||||||
verbose
|
verbose
|
||||||
|
|
||||||
|
shared-secret="{{ turn_secret }}"
|
||||||
@@ -41,13 +41,14 @@ postgres_pw: 9mKeSFE7tH2eY
|
|||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
# Container images
|
# Container images
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
posgres_image: "docker.io/postgres:16-alpine"
|
db_image: "docker.io/postgres:16-alpine"
|
||||||
traefik_image: "docker.io/traefik:v3.6.11"
|
traefik_image: "docker.io/traefik:v3.6.11"
|
||||||
turn_image: "docker.io/coturn/coturn:4.9.0"
|
turn_image: "docker.io/coturn/coturn:4.9.0"
|
||||||
synapse_image: "docker.io/matrixdotorg/synapse:latest"
|
synapse_image: "docker.io/matrixdotorg/synapse:latest"
|
||||||
nginx_image: "docker.io/nginx:alpine"
|
nginx_image: "docker.io/nginx:alpine"
|
||||||
npm_image: "docker.io/jc21/nginx-proxy-manager:latest"
|
npm_image: "docker.io/jc21/nginx-proxy-manager:latest"
|
||||||
|
|
||||||
|
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
# Podman names & volumes
|
# Podman names & volumes
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
@@ -60,6 +61,7 @@ vol_nginx: nginx_html
|
|||||||
vol_teamspeak: teamspeak_data
|
vol_teamspeak: teamspeak_data
|
||||||
npm_data: npm_data
|
npm_data: npm_data
|
||||||
npm_letsencrypt: letsencrypt
|
npm_letsencrypt: letsencrypt
|
||||||
|
vol_db: postgres_db
|
||||||
|
|
||||||
# --------------------------------------------------------------
|
# --------------------------------------------------------------
|
||||||
# Paths on the target host (temporary files)
|
# Paths on the target host (temporary files)
|
||||||
@@ -69,7 +71,7 @@ dynamic_traefik_path: "/tmp/traefik_dynamic.yml"
|
|||||||
turn_conf_path: "/tmp/turnserver.conf"
|
turn_conf_path: "/tmp/turnserver.conf"
|
||||||
synapse_cfg_path: "/tmp/homeserver.yaml"
|
synapse_cfg_path: "/tmp/homeserver.yaml"
|
||||||
nginx_html_path: "/tmp/index.html"
|
nginx_html_path: "/tmp/index.html"
|
||||||
synapse_secret_key_path: "/tmp/matrix.fpov.space.log.config"
|
synapse_secret_key_path: "/tmp/matrix.fpov.space.signing.key"
|
||||||
synapse_log_config: "/tmp/matrix.fpov.space.log.config"
|
synapse_log_config: "/tmp/matrix.fpov.space.log.config"
|
||||||
|
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user