From ecec05031883fe91928da0626c5f497e6746c6e4 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 24 Nov 2019 16:24:29 +0100 Subject: [PATCH] changeback venv name --- tasks/install.yml | 8 ++++---- templates/etc/systemd/system/matrix.service.j2 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tasks/install.yml b/tasks/install.yml index 749bf35..024c074 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -18,7 +18,7 @@ - name: Upgrade python dependencies pip: name: "{{ item }}" - virtualenv: "{{ matrix_base_dir }}/venv" + virtualenv: "{{ matrix_base_dir }}/env" virtualenv_command: /usr/bin/python3 -m venv extra_args: --upgrade loop: @@ -30,19 +30,19 @@ pip: name: matrix-synapse[all] version: "{{ matrix_version }}" - virtualenv: "{{ matrix_base_dir }}/venv" + virtualenv: "{{ matrix_base_dir }}/env" virtualenv_command: /usr/bin/python3 -m venv notify: __matrix_restart - name: Install ldap3 auth provider pip: name: "matrix-synapse-ldap3" - virtualenv: "{{ matrix_base_dir }}/venv" + virtualenv: "{{ matrix_base_dir }}/env" virtualenv_command: /usr/bin/python3 -m venv when: matrix_ldap_auth_enabled | bool - name: Create signing key - shell: "{{ matrix_base_dir }}/venv/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()\"" + 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 }}.signing.key" notify: __matrix_restart diff --git a/templates/etc/systemd/system/matrix.service.j2 b/templates/etc/systemd/system/matrix.service.j2 index 0ddf589..64a7eca 100644 --- a/templates/etc/systemd/system/matrix.service.j2 +++ b/templates/etc/systemd/system/matrix.service.j2 @@ -11,7 +11,7 @@ User={{ matrix_user }} Group={{ matrix_group }} WorkingDirectory={{ matrix_base_dir }} -ExecStart={{ matrix_base_dir }}/venv/bin/python -m synapse.app.homeserver --config-path={{ matrix_conf_dir }}/homeserver.yml +ExecStart={{ matrix_base_dir }}/env/bin/python -m synapse.app.homeserver --config-path={{ matrix_conf_dir }}/homeserver.yml SyslogIdentifier=matrix-synapse [Install]