add different options for client server urls
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
06f3f07c27
commit
c72f04b0ba
|
@ -40,7 +40,8 @@ matrix_conf_dir: "{{ matrix_base_dir }}/config"
|
||||||
matrix_data_dir: "{{ matrix_base_dir }}/data"
|
matrix_data_dir: "{{ matrix_base_dir }}/data"
|
||||||
matrix_log_dir: "{{ matrix_base_dir }}/logs"
|
matrix_log_dir: "{{ matrix_base_dir }}/logs"
|
||||||
|
|
||||||
matrix_base_url: http://localhost
|
matrix_server_url: example.com
|
||||||
|
matrix_client_url: https://matrix.example.com
|
||||||
|
|
||||||
matrix_http_bind_ips:
|
matrix_http_bind_ips:
|
||||||
- '::'
|
- '::'
|
||||||
|
|
|
@ -41,9 +41,9 @@
|
||||||
when: matrix_ldap_auth_enabled
|
when: matrix_ldap_auth_enabled
|
||||||
|
|
||||||
- name: Create signing key
|
- name: Create signing key
|
||||||
shell: "{{ matrix_base_dir }}/env/bin/python -c \"from signedjson import key; file = open('{{ matrix_conf_dir }}/{{ matrix_base_url | urlsplit('hostname') }}.signing.key','w'); key.write_signing_keys(file, [key.generate_signing_key('first')]); file.close()\""
|
shell: "{{ matrix_base_dir }}/env/bin/python -c \"from signedjson import key; file = open('{{ matrix_conf_dir }}/{{ matrix_server_url | urlsplit('hostname') }}.signing.key','w'); key.write_signing_keys(file, [key.generate_signing_key('first')]); file.close()\""
|
||||||
args:
|
args:
|
||||||
creates: "{{ matrix_conf_dir }}/{{ matrix_base_url | urlsplit('hostname') }}.signing.key"
|
creates: "{{ matrix_conf_dir }}/{{ matrix_server_url | urlsplit('hostname') }}.signing.key"
|
||||||
notify: __matrix_restart
|
notify: __matrix_restart
|
||||||
|
|
||||||
- name: Deploy global config files
|
- name: Deploy global config files
|
||||||
|
|
|
@ -6,7 +6,7 @@ upstream backend_matrix {
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 80;
|
||||||
server_name {{ matrix_base_url | urlsplit('hostname') }};
|
server_name {{ matrix_server_url | urlsplit('hostname') }};
|
||||||
|
|
||||||
client_max_body_size 200M;
|
client_max_body_size 200M;
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ server {
|
||||||
{% if matrix_nginx_tls_enabled %}
|
{% if matrix_nginx_tls_enabled %}
|
||||||
server {
|
server {
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
server_name {{ matrix_base_url | urlsplit('hostname') }};
|
server_name {{ matrix_server_url | urlsplit('hostname') }};
|
||||||
|
|
||||||
client_max_body_size 200M;
|
client_max_body_size 200M;
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ tls_fingerprints: []
|
||||||
# This is used by remote servers to connect to this server,
|
# This is used by remote servers to connect to this server,
|
||||||
# e.g. matrix.org, localhost:8080, etc.
|
# e.g. matrix.org, localhost:8080, etc.
|
||||||
# This is also the last part of your UserID.
|
# This is also the last part of your UserID.
|
||||||
server_name: "{{ matrix_base_url | urlsplit('hostname') }}"
|
server_name: "{{ matrix_server_url }}"
|
||||||
|
|
||||||
# When running as a daemon, the file to store the pid in
|
# When running as a daemon, the file to store the pid in
|
||||||
pid_file: /var/run/homeserver.pid
|
pid_file: /var/run/homeserver.pid
|
||||||
|
@ -546,7 +546,7 @@ form_secret: "5l51Jk51RyULKH4RbeYdnI5P^ROOOktfj-nWgK0i8JT_sd-CC."
|
||||||
## Signing Keys ##
|
## Signing Keys ##
|
||||||
|
|
||||||
# Path to the signing key to sign messages with
|
# Path to the signing key to sign messages with
|
||||||
signing_key_path: "{{ matrix_conf_dir }}/{{ matrix_base_url | urlsplit('hostname') }}.signing.key"
|
signing_key_path: "{{ matrix_conf_dir }}/{{ matrix_server_url }}.signing.key"
|
||||||
|
|
||||||
# The keys that the server used to sign messages with but won't use
|
# The keys that the server used to sign messages with but won't use
|
||||||
# to sign new messages. E.g. it has lost its private key
|
# to sign new messages. E.g. it has lost its private key
|
||||||
|
|
Loading…
Reference in New Issue