Merge branch 'imcsk8/signaling-packages' into 'master'

Agregué instalación de singnaling por paquete RPM

See merge request strepsirrhini/lemur!23

nextcloud/ansible/roles/janus/tasks/main.yml

@@ -4,14 +4,6 @@
     name: '*'
     state: latest
 
-- name: Install libreoffice.gob.mx repo
-  get_url:
-    url: https://repos.libreoffice.gob.mx/fedora/libreoffice.gob.mx.repo
-    dest: /etc/yum.repos.d/libreoffice.gob.mx.repo
-    mode: '0644'
-    owner: root
-    group: root
-
 - name: Install required packages
   ansible.builtin.package:
     name:

nextcloud/ansible/roles/pre/tasks/redhat_pre_tasks.yaml

@@ -1,5 +1,8 @@
   - name: Enable The CRB Repository
     ansible.builtin.command: /usr/bin/dnf config-manager --set-enabled crb
+    when:
+      - ansible_os_family  == 'RedHat'
+      - ansible_distribution != 'Fedora'
 
 #- name: "Install Remi repo GPG key"
 #    rpm_key:
@@ -25,6 +28,9 @@
     ansible.builtin.rpm_key:
       state: present
       key: "https://rpms.remirepo.net/enterprise/{{ansible_distribution_major_version}}/RPM-GPG-KEY-remi"
+    when:
+      - ansible_os_family  == 'RedHat'
+      - ansible_distribution != 'Fedora'
 
   - name: Remi::Install REMI repository
     dnf:
@@ -50,6 +56,9 @@
 
   - name: Remi::Reset PHP module
     ansible.builtin.command: /usr/bin/dnf -y module reset php
+    when:
+      - ansible_os_family  == 'RedHat'
+      - ansible_distribution != 'Fedora'
 
   - name: Remi::Install PHP {{ php_version }} module
     ansible.builtin.command: /usr/bin/dnf -y module install php:remi-{{ php_version }}

nextcloud/ansible/roles/signaling-server/handlers/main.yml

@@ -3,4 +3,4 @@
   ansible.builtin.systemd:
     state: restarted
     daemon_reload: yes
-    name: signaling-server
+    name: signaling

nextcloud/ansible/roles/signaling-server/tasks/main.yml

@@ -4,29 +4,21 @@
     state: latest
     name: '*'
 
+- name: Install libreoffice.gob.mx repo
+  get_url:
+    url: https://repos.libreoffice.gob.mx/fedora/libreoffice.gob.mx.repo
+    dest: /etc/yum.repos.d/libreoffice.gob.mx.repo
+    mode: '0644'
+    owner: root
+    group: root
+
 - name: Install required packages
   ansible.builtin.package:
     state: latest
     name:
       - certbot
       - openssl
-
-- name: Install signaling-server
-  block:
-    # TODO: Empaquetar signaling y proveerlo en Fedora
-    - name: Download signaling
-      get_url:
-        url: https://repos.libreoffice.gob.mx/signaling/signaling-latest.tar.gz
-        dest: /usr/src/signaling-latest.tar.gz
-        checksum: "{{ signaling_checksum }}"
-
-    - name: Unpack signaling-server
-      ansible.builtin.unarchive:
-        src: /usr/src/signaling-latest.tar.gz
-        dest: /
-        remote_src: yes
-        owner: root
-        group: root
+      - nextcloud-spreed-signaling
 
 - name: Generate singaling hashkey and blockkey
   block:
@@ -48,24 +40,6 @@
       register: signaling_apikey
       failed_when: signaling_apikey.stdout | length != 32
 
-- name: Configure signaling-server
-  block:
-    - name: Create signaling-server system user
-      ansible.builtin.user:
-        name: signaling
-        system: yes
-        shell: /sbin/nologin
-        home: /var/lib/signaling
-        state: present
-
-    - name: Create configuration directory
-      ansible.builtin.file:
-        path: /etc/signaling
-        state: directory
-        mode: '0750'
-        owner: root
-        group: signaling
-
     - name: Setup configuration file
       ansible.builtin.template:
         src: signaling-server.conf.j2
@@ -75,15 +49,6 @@
         mode: '0640'
       notify: Systemd daemon-reload and restart
 
-    - name: Put signaling-server systemd service in place
-      ansible.builtin.copy:
-        src: signaling-server.service
-        dest: /etc/systemd/system/signaling-server.service
-        owner: root
-        group: root
-        mode: '0644'
-      notify: Systemd daemon-reload and restart
-
 - name: Open up required firewall ports
   block:
     - name: Open up TCP port 80 for LetsEncrypt
@@ -151,6 +116,6 @@
 
 - name: Start and enable signaling
   ansible.builtin.service:
-    name: signaling-server
+    name: signaling
     enabled: yes