Fix issues reported by ansible-lint
This commit is contained in:
parent
a90840b1dc
commit
2e100d290f
59 changed files with 315 additions and 244 deletions
|
@ -4,11 +4,13 @@
|
|||
- synapse
|
||||
- matrix
|
||||
block:
|
||||
- import_tasks: prepare-common-service.yml
|
||||
- name: Import prepare tasks for common service
|
||||
ansible.builtin.import_tasks: tasks/prepare-common-service.yml
|
||||
|
||||
- name: Set synapse config path
|
||||
ansible.builtin.set_fact:
|
||||
config_path: "{{ (service_path, svc.config_path) | path_join }}"
|
||||
|
||||
- name: Create config directory
|
||||
ansible.builtin.file:
|
||||
path: "{{ config_path }}"
|
||||
|
@ -20,17 +22,18 @@
|
|||
src: service.yml.j2
|
||||
dest: "{{ (config_path, 'homeserver.yaml') | path_join }}"
|
||||
mode: "0644"
|
||||
|
||||
|
||||
- name: Copy the log config
|
||||
ansible.builtin.copy:
|
||||
src: msrg.cc.log.config
|
||||
dest: "{{ (config_path, 'msrg.cc.log.config') | path_join }}"
|
||||
mode: '0644'
|
||||
mode: "0644"
|
||||
|
||||
- name: Copy the signing key
|
||||
ansible.builtin.copy:
|
||||
content: "{{ vault_synapse.signing_key }}"
|
||||
dest: "{{ (config_path, 'msrg.cc.signing.key') | path_join }}"
|
||||
mode: '0644'
|
||||
mode: "0644"
|
||||
|
||||
- import_tasks: start-common-service.yml
|
||||
- name: Import start tasks for common service
|
||||
ansible.builtin.import_tasks: tasks/start-common-service.yml
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
---
|
||||
svc:
|
||||
name: synapse
|
||||
domain: "matrix.msrg.cc"
|
||||
domain: matrix.msrg.cc
|
||||
docker_host: synapse-admin
|
||||
port: 80
|
||||
caddy_extra: |
|
||||
|
@ -11,7 +12,7 @@ svc:
|
|||
reverse_proxy synapse:8008
|
||||
}
|
||||
extra_svcs:
|
||||
- domain: "msrg.cc:8008"
|
||||
- domain: msrg.cc:8008
|
||||
additional_domains:
|
||||
- matrix.msrg.cc:8448
|
||||
- matrix.msrg.cc:8008
|
||||
|
@ -30,7 +31,7 @@ svc_env:
|
|||
REACT_APP_SERVER: https://matrix.msrg.cc
|
||||
|
||||
svc_yml:
|
||||
server_name: "msrg.cc"
|
||||
server_name: msrg.cc
|
||||
pid_file: "{{ (svc.config_path, 'homeserver.pid') | path_join }}"
|
||||
public_baseurl: https://matrix.msrg.cc/
|
||||
allow_public_rooms_without_auth: true
|
||||
|
@ -43,28 +44,28 @@ svc_yml:
|
|||
x_forwarded: true
|
||||
resources:
|
||||
- names:
|
||||
- client
|
||||
- federation
|
||||
- metrics
|
||||
- client
|
||||
- federation
|
||||
- metrics
|
||||
compress: false
|
||||
|
||||
admin_contact: "mailto:{{ admin_email }}"
|
||||
admin_contact: mailto:{{ admin_email }}
|
||||
|
||||
acme:
|
||||
enabled: false
|
||||
enabled: false
|
||||
|
||||
database:
|
||||
name: "psycopg2"
|
||||
args:
|
||||
user: "{{ svc.db.user }}"
|
||||
password: "{{ svc.db.pass }}"
|
||||
database: "{{ svc.db.database }}"
|
||||
host: "{{ svc.db.host }}"
|
||||
cp_min: 5
|
||||
cp_max: 10
|
||||
name: psycopg2
|
||||
args:
|
||||
user: "{{ svc.db.user }}"
|
||||
password: "{{ svc.db.pass }}"
|
||||
database: "{{ svc.db.database }}"
|
||||
host: "{{ svc.db.host }}"
|
||||
cp_min: 5
|
||||
cp_max: 10
|
||||
|
||||
log_config: "{{ (svc.config_path, 'msrg.cc.log.config') | path_join }}"
|
||||
media_store_path: "/media_store"
|
||||
media_store_path: /media_store
|
||||
max_upload_size: 500M
|
||||
enable_registration: false
|
||||
enable_metrics: true
|
||||
|
@ -75,19 +76,19 @@ svc_yml:
|
|||
signing_key_path: "{{ (svc.config_path, 'msrg.cc.signing.key') | path_join }}"
|
||||
|
||||
trusted_key_servers:
|
||||
- server_name: "matrix.org"
|
||||
- server_name: matrix.org
|
||||
suppress_key_server_warning: true
|
||||
|
||||
oidc_providers:
|
||||
- idp_id: "auth_serguzim_me"
|
||||
idp_name: "auth.serguzim.me"
|
||||
issuer: "https://auth.serguzim.me/application/o/matrix_serguzim_me/"
|
||||
- idp_id: auth_serguzim_me
|
||||
idp_name: auth.serguzim.me
|
||||
issuer: https://auth.serguzim.me/application/o/matrix_serguzim_me/
|
||||
client_id: "{{ vault_synapse.oidc_client.id }}"
|
||||
client_secret: "{{ vault_synapse.oidc_client.secret }}"
|
||||
scopes:
|
||||
- "openid"
|
||||
- "profile"
|
||||
- "email"
|
||||
- openid
|
||||
- profile
|
||||
- email
|
||||
user_mapping_provider:
|
||||
config:
|
||||
localpart_template: "{{ '{{ user.preferred_username }}' }}"
|
||||
|
@ -96,10 +97,10 @@ svc_yml:
|
|||
email:
|
||||
smtp_host: mail.serguzim.me
|
||||
smtp_port: 587
|
||||
smtp_user: "matrix@serguzim.me"
|
||||
smtp_user: matrix@serguzim.me
|
||||
smtp_pass: "{{ vault_synapse.mail.pass }}"
|
||||
require_transport_security: true
|
||||
notif_from: "Matrix <matrix@serguzim.me>"
|
||||
notif_from: Matrix <matrix@serguzim.me>
|
||||
|
||||
compose:
|
||||
watchtower: true
|
||||
|
@ -111,15 +112,15 @@ compose:
|
|||
file:
|
||||
services:
|
||||
synapse-admin:
|
||||
image: awesometechnologies/synapse-admin
|
||||
restart: always
|
||||
labels:
|
||||
com.centurylinklabs.watchtower.enable: true
|
||||
env_file:
|
||||
- service.env
|
||||
networks:
|
||||
apps:
|
||||
aliases:
|
||||
- synapse-admin
|
||||
image: awesometechnologies/synapse-admin
|
||||
restart: always
|
||||
labels:
|
||||
com.centurylinklabs.watchtower.enable: true
|
||||
env_file:
|
||||
- service.env
|
||||
networks:
|
||||
apps:
|
||||
aliases:
|
||||
- synapse-admin
|
||||
volumes:
|
||||
media_store:
|
||||
|
|
Reference in a new issue