ansible
/
xoxys.matrix
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix client server url
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Robert Kaussow 2019-01-20 15:02:02 +01:00
parent c72f04b0ba
commit cce0aab91b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/install.yml
View File

@ -41,9 +41,9 @@
when: matrix_ldap_auth_enabled
- name: Create signing key
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()\""
shell: "{{ matrix_base_dir }}/env/bin/python -c \"from signedjson import key; file = open('{{ matrix_conf_dir }}/{{ matrix_server_url }}.signing.key','w'); key.write_signing_keys(file, [key.generate_signing_key('first')]); file.close()\""
args:
creates: "{{ matrix_conf_dir }}/{{ matrix_server_url | urlsplit('hostname') }}.signing.key"
creates: "{{ matrix_conf_dir }}/{{ matrix_server_url }}.signing.key"
notify: __matrix_restart
- name: Deploy global config files

4
templates/nginx/vhost.j2
View File

@ -6,7 +6,7 @@ upstream backend_matrix {
server {
listen 80;
server_name {{ matrix_server_url | urlsplit('hostname') }};
server_name {{ matrix_client_url | urlsplit('hostname') }};
client_max_body_size 200M;
@ -23,7 +23,7 @@ server {
{% if matrix_nginx_tls_enabled %}
server {
listen 443 ssl;
server_name {{ matrix_server_url | urlsplit('hostname') }};
server_name {{ matrix_client_url | urlsplit('hostname') }};
client_max_body_size 200M;