Merge branch 'master' of git.softwarelibre.mx:strepsirrhini/lemur

nextcloud/README.md

@@ -13,5 +13,5 @@ workstation $ ssh-copy-id root@server_ip
 Use the ansible playbooks to setup the nextcloud appliance
 
 ```
-workstation $ ansible-playbook -i server_ip, ansible/nextcloud_bootstrap.yaml
+workstation $ ansible-playbook -i inventory_source, ansible/nextcloud_bootstrap.yaml
 ```

nextcloud/ansible/files/0C54D189F4BA284D.asc

@@ -0,0 +1,33 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFKVtusBCACxi5Ri86yYCZ6dWTbXXiCIps82UWBksjRoxizATHQ7o5Y5ujf2
+KtTlR8znLA1Lm4JhBUGe9a6L3+sM1M7AyU6glkl2MOY5tA1mqnPS4VLJP58ZoPPr
+2Ll7mELqSGBQwNIE4UqOi8z4mEV/Uf79xpnlMZLJBMMV3ZmG+CfkXcm6aZe4v1hg
+CYfDuTXLFRGC/rpc7lVxmIpDHewCfOY6Y/FsVo0rkKftTF0HSr5dPSgVoI0GJjPk
+cKAsKGw4dznM9oVNnFCIRJeavy/aMgEn0JDmUkIrtoOqu5miUaXGpMsn8ppbE2xW
+7Ey7Jq4plTwwgjMEzOU75oA9/i9E3J4LSehhABEBAAG0MkNvbGxhYm9yYSBQcm9k
+dWN0aXZpdHkgPGxpYnJlb2ZmaWNlQGNvbGxhYm9yYS5jb20+iQE4BBMBAgAiBQJW
+ONEfAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAMVNGJ9LooTaDIB/9K
+uZCeCT2DCQEQzLQSod88LxyOdW/zRYtlHbbjGuOQS7dv8Pup+nWd3cH2BMZYj4E3
+LYmbZDV/fG1JobNbwStrFc7BA4TTtV0K2Jwl34KqDr/QrFiuZMSgXnP2C/THrNqb
+fCOa6b4x6Hfh6fOT0dotjHwXNM9dnrNI8dFpoGmVAQTK5E4uFdK2eFhcd206HP5p
+EnzTIC+DeRvADHjs41S7ziLrdnzR6N0g2W3s+Toc9xVweCjkBvanolvJaaodiXl6
+QUvfUw1NvTyVwz5IrNlHrjdjDpNmT+uLWAytjMq4meKmF+r3PSFfTfpgvHKnZAEo
+QI93kEtb0eqJz4JGBN2rtD5MaWJyZU9mZmljZS1mcm9tLUNvbGxhYm9yYSA8c3Vw
+cG9ydEBsaWJyZW9mZmljZS5jb2xsYWJvcmEuY29tPokBOAQTAQIAIgUCVTH9RQIb
+AwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQDFTRifS6KE0B4gf9Fd0QGPmn
+O4pF1i3unwM9mqZNmNL7wgAaHOc8z9AgTtmfASU+EJQw/gPmdCNuxsU9h+fdgzM9
+uisoSj+k9wXL+46LklnbMB1Nf8kzsm9rxhvtcdUvJxS1LdvCq1a0iRJDUVCgxMdG
+0GfEY+PiQv595RsE7XNQPvFEtcr6HM8XviqLdE0gGvod5Az8VdJT54RjiuIkUvZ4
+/AgYEjXKZ0O8tb1CZIL43jf7BtWy89PhRnpUD09b9ObG0NcFp7NYHYg0JBN1k/Gh
+ffxoYHADvYEqe4WJDHxGl7IeHL3zc2SP1KP/IDaR4WS7jZ8bzNhffXjWmZu77oBh
+tTvtgDMsljpFhbQ5Q29sbGFib3JhIExpYnJlT2ZmaWNlIDxzdXBwb3J0QGxpYnJl
+b2ZmaWNlLmNvbGxhYm9yYS5jb20+iQE4BBMBAgAiBQJSlbbrAhsDBgsJCAcDAgYV
+CAIJCgsEFgIDAQIeAQIXgAAKCRAMVNGJ9LooTQWgB/99oFs2BUStFnmNdrRoRRWy
+OLRvPjzhK2P0zjcH7vlezg194jhQ49vWGs2JxvRr2wzIp19J5YWQVFAzwfapG02l
+hYQWkJLoQn7+6WFOZoXQ9oyAqCHHG0ugIrK/elR+YBrAgc8DJj7V5gFuNMdSSueC
+HHFaVPVHT5aVhRZLeoUYMqEJSwMtryZV9VecprBcKwDh0DpVEXVwTQ9fTz/fUunn
+AXh1DCYFqGPEwdbBVWk6+fUXs4iG2soP4bgvOrQhdpvpwYhtRzOsgxUmvBDnCqlL
++MnrKqDao9z/8pb+ZeXbCbI/kK1Zaw21r5FwqM6Z6k5MxHnbf3Ni87DSmBX2DHFJ
+=FJ0s
+-----END PGP PUBLIC KEY BLOCK-----

nextcloud/ansible/nextcloud_appliance.yaml

@@ -4,9 +4,10 @@
     nextcloud_path: "{{ '/usr/share/nginx/html' if ansible_distribution_file_variety == 'RedHat' else '/var/www/html' }}"
     nextcloud_occ: "{{ nextcloud_path }}/occ"
     nginx_path: "{{ '/etc/nginx/conf.d' if ansible_distribution_file_variety == 'RedHat' else '/etc/nginx/sites-enabled' }}"
-    php_ini_path: "{{ '/etc' if ansible_distribution_file_variety == 'RedHat' else '/etc/php/7.4/fpm' }}"
-    php_pool_path: "{{ '/etc/php-fpm.d' if ansible_distribution_file_variety == 'RedHat' else '/etc/php/7.4/fpm/pool.d' }}"
-    php_fpm_service: "{{ 'php-fpm' if ansible_distribution_file_variety == 'RedHat' else 'php7.4-fpm' }}"
+    # FIXME: Set PHP version from Debian version: 7.4 for Debian 11, 7.3 for Debian 10
+    php_ini_path: "{{ '/etc' if ansible_distribution_file_variety == 'RedHat' else '/etc/php/7.3/fpm' }}"
+    php_pool_path: "{{ '/etc/php-fpm.d' if ansible_distribution_file_variety == 'RedHat' else '/etc/php/7.3/fpm/pool.d' }}"
+    php_fpm_service: "{{ 'php-fpm' if ansible_distribution_file_variety == 'RedHat' else 'php7.3-fpm' }}"
     document_root: "{{ '/usr/share/nginx/html' if ansible_distribution_file_variety == 'RedHat' else '/var/www/html' }}"
     web_user: "{{ 'nginx' if ansible_distribution_file_variety == 'RedHat' else 'www-data' }}"
     pg_hba_conf: "{{ '/var/lib/pgsql/data/pg_hba.conf' if ansible_distribution_file_variety == 'RedHat' else '/etc/postgresql/13/main/pg_hba.conf' }}"
@@ -160,12 +161,12 @@
          - php-pgsql
          - php-cli
          - php-curl
-         - php7.4-xml
          - php-gd
          - php-json
          - php-ldap
          - php-mbstring
-         - php7.4-xml
+         #- php7.4-xml # en Debián 10 la versión de PHP es 7.3 y en este paquete el 7.4 causa conflicto
+         - php-xml
          #- php-xmlwriter
          - php-zip
          - php-ldap
@@ -181,8 +182,9 @@
 
     - name: Add Collabora apt key by id from keyserver for Debian 10
       ansible.builtin.apt_key:
-        keyserver: keyserver.ubuntu.com
+        #keyserver: keyserver.ubuntu.com
         id: 0C54D189F4BA284D
+        data: "{{ lookup('file', 'files/0C54D189F4BA284D.asc') }}"
       tags:
         - debian-collabora-repos 
         - collabora
@@ -232,6 +234,7 @@
   #    mode: '0755'
   #    owner: "{{ web_user }}"
 
+  # FIXME: Download only once
   - name: Download Nextcloud
     ansible.builtin.unarchive:
       src: "https://download.nextcloud.com/server/releases/nextcloud-{{nextcloud_version}}.tar.bz2"