cleanup

defaults/main.yml

@@ -18,7 +18,6 @@ matrix_packages:
   - tcl-devel
   - tk-devel
   - redhat-rpm-config
-  - python-virtualenv
   - python36-devel
   - libffi-devel
   - openssl-devel

tasks/install.yml

@@ -18,7 +18,7 @@
     - name: Upgrade python dependencies
       pip:
         name: "{{ item }}"
-        virtualenv: "{{ matrix_base_dir }}/env"
+        virtualenv: "{{ matrix_base_dir }}/venv"
         virtualenv_command: /usr/bin/python3 -m venv
         extra_args: --upgrade
       loop:
@@ -26,23 +26,23 @@
         - setuptools
         - "psycopg2~=2.7.0"
 
-    - name: Install with pip and virtualenv
+    - name: Install Synapse in virtualenv
       pip:
         name: matrix-synapse[all]
         version: "{{ matrix_version }}"
-        virtualenv: "{{ matrix_base_dir }}/env"
+        virtualenv: "{{ matrix_base_dir }}/venv"
         virtualenv_command: /usr/bin/python3 -m venv
       notify: __matrix_restart
 
     - name: Install ldap3 auth provider
       pip:
         name: "matrix-synapse-ldap3"
-        virtualenv: "{{ matrix_base_dir }}/env"
+        virtualenv: "{{ matrix_base_dir }}/venv"
         virtualenv_command: /usr/bin/python3 -m venv
       when: matrix_ldap_auth_enabled | bool
 
     - name: Create signing key
-      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()\""
+      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()\""
       args:
         creates: "{{ matrix_conf_dir }}/{{ matrix_server_url }}.signing.key"
       notify: __matrix_restart

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 }}/env/bin/python -m synapse.app.homeserver --config-path={{ matrix_conf_dir }}/homeserver.yml
+ExecStart={{ matrix_base_dir }}/venv/bin/python -m synapse.app.homeserver --config-path={{ matrix_conf_dir }}/homeserver.yml
 SyslogIdentifier=matrix-synapse
 
 [Install]