Merge branch 'feature/jitsi-update-stable-8960-1'

README.md

@@ -16,8 +16,7 @@ Role Variables
 
 | Variable                             | Description                                                                                                                                                 | Default                                        |
 | ---------------------------          | -------------------------------------------------------------------------------                                                                             | ------------------                             |
-| jitsi_install_user                   | The user who is going to manage/run the Docker Compose services                                                                                             | {{ ansible_user }}                             |
-| jitsi_install_path                   | The location where the service should be deployed                                                                                                           | /home/{{ jitsi_install_user }}                 |
+| docker_user                          | The user who is going to manage/run the Docker Compose services                                                                                             | deploy                                         |
 | jitsi_build_latest_image_from_source | Will fetch the master of `jitsi_docker_upstream_repo_url` and build the docker image as sometimes the latest available images in the Docker Hub are too old | yes                                            |
 | jitsi_docker_upstream_repo_url       | Git repo of docker-jitsi-meet required by `jitsi_build_latest_image_from_source`                                                                            | https://github.com/jitsi/docker-jitsi-meet.git |
 | *jitsi_letsencrypt_email*            | E-Mail adress used for requesting certificates                                                                                                              | Not set                                        |

defaults/main.yml

@@ -2,8 +2,6 @@
 # defaults file for jitsi
 docker_user: deploy
 jitsi_image_version: stable-8960-1
-jitsi_install_user: '{{ ansible_user }}' # This user must be present on the host
-jitsi_install_path: '/home/{{ jitsi_install_user }}'
 #jitsi_letsencrypt_email:alice@host.tld
 jitsi_enable_letsencrypt: no
 jitsi_exposed_http_port: 8000

src

@@ -1 +1 @@
-Subproject commit aec6021f2098435650c19ba85b27de114dd8bde0
+Subproject commit fe5dea34021da7048492f93e6fb90bfd59763153

tasks/main.yml

@@ -2,51 +2,51 @@
 # tasks file for jitsi
 - name: Ensure jitsi Docker Compose config directory exists
   file:
-    path: "{{ jitsi_install_path }}/jitsi"
+    path: /home/{{ docker_user }}/jitsi
     state: directory
-    owner: '{{ jitsi_install_user }}'
-    group: '{{ jitsi_install_user }}'
+    owner: '{{ docker_user }}'
+    group: '{{ docker_user }}'
   tags: config
 
 - name: "Teardown: Remove Jitsi runtime config"
   file:
-    path: "{{ jitsi_install_path }}/jitsi/conf"
+    path: /home/{{ docker_user }}/jitsi/conf
     state: absent
   tags: ['never', 'teardown']
 
 - name: Ensure jitsi config directory exists
   file:
-    path: "{{ jitsi_install_path }}/jitsi/conf"
+    path: /home/{{ docker_user }}/jitsi/conf
     state: directory
-    owner: '{{ jitsi_install_user }}'
-    group: '{{ jitsi_install_user }}'
+    owner: '{{ docker_user }}'
+    group: '{{ docker_user }}'
   tags: config
 
 - name: "Git: Pull latest upstream docker-jitsi-meet sources (master)"
   git:
     repo: "{{ jitsi_docker_upstream_repo_url }}"
-    dest: "{{ jitsi_install_path }}/jitsi/docker-jitsi-meet-src"
+    dest: /home/{{ docker_user }}/jitsi/docker-jitsi-meet-src
     version: master
   register: git_pull_jitsi_docker_upstream_repo
   when: jitsi_build_latest_image_from_source == True
 
 - name: "Build Jitsi Docker images"
   shell:
-    chdir: "{{ jitsi_install_path }}/jitsi/docker-jitsi-meet-src"
+    chdir: /home/{{ docker_user }}/jitsi/docker-jitsi-meet-src
     cmd: make
   when: git_pull_jitsi_docker_upstream_repo.changed
 
 - name: Provide docker-compose.yml
   template:
     src: templates/docker-compose.jitsi.yml.j2
-    dest: "{{ jitsi_install_path }}/jitsi/docker-compose.yml"
-    owner: "{{ jitsi_install_user }}"
-    group: "{{ jitsi_install_user }}"
+    dest: /home/{{ docker_user }}/jitsi/docker-compose.yml
+    owner: "{{ docker_user }}"
+    group: "{{ docker_user }}"
     mode: '0644'
   tags: config
 
 - name: Output docker-compose.yml
-  shell: cat {{ jitsi_install_path }}/jitsi/docker-compose.yml
+  shell: cat /home/{{ docker_user }}/jitsi/docker-compose.yml
   register: output
   tags: config
 
@@ -56,21 +56,21 @@
 - name: Provide Jitsi env vars
   template:
     src: templates/env.jitsi.j2
-    dest: "{{ jitsi_install_path }}/jitsi/.env"
-    owner: "{{ jitsi_install_user }}"
-    group: "{{ jitsi_install_user }}"
+    dest: /home/{{ docker_user }}/jitsi/.env
+    owner: "{{ docker_user }}"
+    group: "{{ docker_user }}"
     mode: '0640'
   tags: config
 
 - name: "docker-compose: Teardown existing Jitsi service"
   docker_compose:
-    project_src: "{{ jitsi_install_path }}/jitsi/"
+    project_src: "/home/{{ docker_user }}/jitsi/"
     state: absent
   tags: ['never', 'teardown']
 
 - name: "docker-compose: Bootstrap Jitsi service"
   docker_compose:
-    project_src: "{{ jitsi_install_path }}/jitsi/"
+    project_src: "/home/{{ docker_user }}/jitsi/"
     pull: yes
   register: output
 
@@ -83,7 +83,7 @@
 
 - name: "Config: Set channelLastN"
   lineinfile:
-    path: "{{ jitsi_install_path }}/jitsi/conf/web/config.js"
+    path: /home/{{ docker_user }}/jitsi/conf/web/config.js
     regexp: '(\s*)channelLastN:\s*[^,]+,'
     line: '\1channelLastN: {{jitsi_web_channel_last_n|default("-1")}},'
     backrefs: yes
@@ -91,7 +91,7 @@
 
 - name: "Config: Disable third party requests"
   lineinfile:
-    path: "{{ jitsi_install_path }}/jitsi/conf/web/config.js"
+    path: /home/{{ docker_user }}/jitsi/conf/web/config.js
     regexp: '(\s*)(//\s*)?disableThirdPartyRequests:\s*false,'
     line: '\1disableThirdPartyRequests: true,'
     backrefs: yes