Merge pull request #2 from systemli/update-upstream-package

update handlers and service tasks after renaming to jitsi-videobridge2
systemli · Mar 31, 2020 · 2c60f31 · 2c60f31
2 parents b486087 + 1e65cc2
commit 2c60f31
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -20,7 +20,7 @@ jitsi_meet_debconf_settings:
     vtype: string
   - name: jitsi-meet
     question: jitsi-meet/jvb-serve
-    value: "true"
+    value: true|bool
     vtype: boolean
   - name: jitsi-meet-prosody
     question: jitsi-meet-prosody/jvb-hostname

diff --git a/handlers/main.yml b/handlers/main.yml
@@ -10,17 +10,12 @@
     name: nginx
     state: restarted
 
-- name: restart jitsi-videobridge
+- name: restart jitsi-videobridge2
   service:
-    name: jitsi-videobridge
+    name: jitsi-videobridge2
     state: restarted
 
 - name: restart jicofo
   service:
     name: jicofo
     state: restarted
-
-- name: restart jitsi-videobridge
-  service:
-    name: jitsi-videobridge
-    state: restarted
diff --git a/tasks/jitsi-meet.yml b/tasks/jitsi-meet.yml
@@ -22,6 +22,7 @@
 - name: Install jitsi-meet
   apt:
     pkg: jitsi-meet
+    install_recommends: no
     state: present
 
 - name: Copy sip-communicator.properties
@@ -30,6 +31,7 @@
     dest: /etc/jitsi/videobridge/sip-communicator.properties
     owner: jvb
     group: jitsi
+  notify: restart jitsi-videobridge2
 
 - name: Copy jicofo config
   template:
@@ -47,36 +49,35 @@
     group: jitsi
   notify: restart jicofo
 
-- name: Copy jitsi-videobridge config
+- name: Copy jitsi-videobridge2 config
   template:
     src: jvb.j2
     dest: /etc/jitsi/videobridge/config
     owner: jvb
     group: jitsi
-  notify: restart jitsi-videobridge
+  notify: restart jitsi-videobridge2
 
-- name: Copy jitsi-videobridge log.properties
+- name: Copy jitsi-videobridge2 log.properties
   template:
     src: jvb_logging.properties.j2
     dest: /etc/jitsi/videobridge/logging.properties
     owner: jvb
     group: jitsi
-  notify: restart jitsi-videobridge
+  notify: restart jitsi-videobridge2
 
 - name: Copy jitsi meet config
   template:
     src: meet-config.js.j2
     dest: "/etc/jitsi/meet/{{ jitsi_meet_server_name }}-config.js"
 
-- name: Enable jitsi-videobridge
+- name: Enable jitsi-videobridge2
   service:
-    name: jitsi-videobridge
+    name: jitsi-videobridge2
     enabled: yes
 
 - name: Enable jicofo
   service:
     name: jicofo
     enabled: yes
 
-- name: Force all notified handlers
-  meta: flush_handlers
+- meta: flush_handlers