Update to 2022-02-28 18:00

roles/etherpad/defaults/main.yml

@@ -8,11 +8,11 @@ etherpad_root_dir: /opt/etherpad_{{ etherpad_id }}
 # Unix account under which etherpad will run. The user will be created if it doesn't exist
 etherpad_user: etherpad_{{ etherpad_id }}
 # Version to deploy
-etherpad_version: 1.8.16
+etherpad_version: 1.8.17
 # URL from where the archive will be downloaded
 etherpad_archive_url: https://github.com/ether/etherpad-lite/archive/{{ etherpad_version }}.tar.gz
-# Expected sha1 of the archive, to check the download were OK
-etherpad_archive_sha1: 048801cdcf597a1b3b14c7ef560daa839e836435
+# Expected sha256 of the archive, to check the download were OK
+etherpad_archive_sha256: 3b51eb0259764669dedfb4d13cdbe8d4a2dea37735fe32941aac39b5def9f99b
 # Port on which the service will listen
 etherpad_port: 9003
 # List of IP/CIDR for which the port will be opened (if iptables_manage == True)
@@ -40,8 +40,8 @@ etherpad_theme: colibris
 
 # List of plugins to install
 etherpad_plugins_base:
-  - delete_after_delay
-  - delete_empty_pads
+  - adminpads2
+  - markdown
 etherpad_plugins_extra: []
 etherpad_plugins: "{{ etherpad_plugins_base + etherpad_plugins_extra }}"
 

roles/etherpad/tasks/install.yml

@@ -13,7 +13,7 @@
       get_url:
         url: "{{ etherpad_archive_url }}"
         dest: "{{ etherpad_root_dir }}/tmp"
-        checksum: "sha1:{{ etherpad_archive_sha1 }}"
+        checksum: "sha256:{{ etherpad_archive_sha256 }}"
     
     - name: Extract etherpad
       unarchive:
@@ -34,41 +34,20 @@
   tags: etherpad
 
 - name: Install node modules
-  npm:
-    path: "{{ etherpad_root_dir }}/app/src"
-    state: "{{ (etherpad_install_mode == 'none') | ternary('present','latest') }}"
+  command: sh ./bin/installDeps.sh
+  args:
+    chdir: "{{ etherpad_root_dir }}/app"
   become_user: "{{ etherpad_user }}"
+  when: etherpad_install_mode != 'none'
   notify: restart etherpad
   tags: etherpad
 
 - name: Install plugins
-  npm:
-    name: ep_{{ item }}
-    path: "{{ etherpad_root_dir }}/app/src"
-    state: "{{ (etherpad_install_mode == 'none') | ternary('present','latest') }}"
-  loop: "{{ etherpad_plugins }}"
+  command: "{{ etherpad_root_dir }}/app/src/node_modules/.bin/npm install --no-save --legacy-peer-deps {{ etherpad_plugins | map('regex_replace', '(.+)', 'ep_\\1') | list | join(' ') }}"
+  args:
+    chdir: "{{ etherpad_root_dir }}/app/"
   become_user: "{{ etherpad_user }}"
-  notify: restart etherpad
-  tags: etherpad
-
-- name: Link plugins
-  file: src={{ etherpad_root_dir }}/app/src/node_modules/ep_{{ item }} dest={{ etherpad_root_dir }}/app/node_modules/ep_{{ item }} state=link
-  loop: "{{ etherpad_plugins }}"
-  notify: restart etherpad
-  tags: etherpad
-
-- name: List linked plugins
-  shell: find {{ etherpad_root_dir }}/app/node_modules/ -type l -maxdepth 1 -mindepth 1 -exec basename "{}" \;
-  register: etherpad_linked_plugins
-  changed_when: False
-  tags: etherpad
-
-- name: Unlink unmanaged plugins
-  file: path={{ etherpad_root_dir }}/app/node_modules/{{ item }} state=absent
-  loop: "{{ etherpad_linked_plugins.stdout_lines }}"
-  when:
-    - item | regex_replace('^ep_', '') not in etherpad_plugins
-    - item != 'ep_etherpad-lite'
+  when: etherpad_install_mode != 'none'
   notify: restart etherpad
   tags: etherpad
 

roles/etherpad/tasks/main.yml

@@ -1,17 +1,28 @@
 ---
 
-- include: user.yml
-- include: directories.yml
-- include: facts.yml
-- include: archive_pre.yml
-  when: etherpad_install_mode == 'upgrade'
-- include: install.yml
-- include: conf.yml
-- include: iptables.yml
+- include_tasks: user.yml
+  tags: always
+- include_tasks: directories.yml
+  tags: always
+- include_tasks: facts.yml
+  tags: always
+- include_tasks: archive_pre.yml
+  when: etherpad_install_mode | default('none') == 'upgrade'
+  tags: always
+- include_tasks: install.yml
+  tags: always
+- include_tasks: conf.yml
+  tags: always
+- include_tasks: iptables.yml
   when: iptables_manage | default(True)
-- include: service.yml
-- include: write_version.yml
-- include: archive_post.yml
-  when: etherpad_install_mode == 'upgrade'
-- include: cleanup.yml
+  tags: always
+- include_tasks: service.yml
+  tags: always
+- include_tasks: write_version.yml
+  tags: always
+- include_tasks: archive_post.yml
+  when: etherpad_install_mode | default('none') == 'upgrade'
+  tags: always
+- include_tasks: cleanup.yml
+  tags: always