From a2615486bbc1d918ceeebe5b0110b7a07e286a6f Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Mon, 28 Feb 2022 18:00:08 +0100 Subject: [PATCH] Update to 2022-02-28 18:00 --- roles/common/tasks/main.yml | 6 +-- roles/composer/tasks/main.yml | 6 ++- roles/crowdsec/tasks/main.yml | 24 +++++++---- .../crowdsec_firewall_bouncer/tasks/main.yml | 21 ++++++---- roles/docker/tasks/main.yml | 15 ++++--- roles/etherpad/defaults/main.yml | 10 ++--- roles/etherpad/tasks/install.yml | 39 ++++-------------- roles/etherpad/tasks/main.yml | 37 +++++++++++------ roles/freepbx/tasks/main.yml | 10 ++--- roles/lemonldap_ng/files/logos/wbo.png | Bin 0 -> 1316 bytes roles/unifi/defaults/main.yml | 12 +++++- roles/unifi/tasks/main.yml | 5 ++- 12 files changed, 103 insertions(+), 82 deletions(-) create mode 100644 roles/lemonldap_ng/files/logos/wbo.png diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index b91f342..414e9ad 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -7,7 +7,7 @@ - vars/{{ ansible_distribution }}.yml - vars/{{ ansible_os_family }}.yml -- include: facts.yml +- include_tasks: facts.yml - include_tasks: utils.yml - include_tasks: hostname.yml - include_tasks: tz.yml @@ -15,9 +15,9 @@ when: - ansible_virtualization_role == 'host' or ansible_virtualization_type != 'lxc' - ansible_os_family == 'RedHat' -- include: mail.yml +- include_tasks: mail.yml - include_tasks: system.yml -- include: ansible.yml +- include_tasks: ansible.yml - include_tasks: hardware.yml when: ansible_virtualization_role == 'host' - include_tasks: guest.yml diff --git a/roles/composer/tasks/main.yml b/roles/composer/tasks/main.yml index 6392c89..ee07999 100644 --- a/roles/composer/tasks/main.yml +++ b/roles/composer/tasks/main.yml @@ -1,4 +1,6 @@ --- -- include: install.yml -- include: cleanup.yml +- include_tasks: install.yml + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/crowdsec/tasks/main.yml b/roles/crowdsec/tasks/main.yml index 23c1263..5bbd295 100644 --- a/roles/crowdsec/tasks/main.yml +++ b/roles/crowdsec/tasks/main.yml @@ -1,11 +1,19 @@ --- -- include: user.yml -- include: directories.yml -- include: facts.yml -- 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: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: iptables.yml when: iptables_manage | default(True) -- include: services.yml -- include: cleanup.yml + tags: always +- include_tasks: services.yml + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/crowdsec_firewall_bouncer/tasks/main.yml b/roles/crowdsec_firewall_bouncer/tasks/main.yml index 9575cea..8975683 100644 --- a/roles/crowdsec_firewall_bouncer/tasks/main.yml +++ b/roles/crowdsec_firewall_bouncer/tasks/main.yml @@ -1,10 +1,17 @@ --- -- include: directories.yml -- include: facts.yml -- include: install.yml -- include: conf.yml -- include: iptables.yml +- include_tasks: directories.yml + tags: always +- include_tasks: facts.yml + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: iptables.yml when: iptables_manage | default(True) -- include: services.yml -- include: cleanup.yml + tags: always +- include_tasks: services.yml + tags: always +- include_tasks: cleanup.yml + tags: always diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 8da754b..27896be 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -1,7 +1,12 @@ --- -- include: facts.yml -- include: directories.yml -- include: install.yml -- include: conf.yml -- include: service.yml +- include_tasks: facts.yml + tags: always +- include_tasks: directories.yml + tags: always +- include_tasks: install.yml + tags: always +- include_tasks: conf.yml + tags: always +- include_tasks: service.yml + tags: always diff --git a/roles/etherpad/defaults/main.yml b/roles/etherpad/defaults/main.yml index a08d4a9..475d20c 100644 --- a/roles/etherpad/defaults/main.yml +++ b/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 }}" diff --git a/roles/etherpad/tasks/install.yml b/roles/etherpad/tasks/install.yml index d3c77f2..017d4b3 100644 --- a/roles/etherpad/tasks/install.yml +++ b/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 diff --git a/roles/etherpad/tasks/main.yml b/roles/etherpad/tasks/main.yml index 31bf39d..c871ff5 100644 --- a/roles/etherpad/tasks/main.yml +++ b/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 diff --git a/roles/freepbx/tasks/main.yml b/roles/freepbx/tasks/main.yml index c09f6d6..8cc92a2 100644 --- a/roles/freepbx/tasks/main.yml +++ b/roles/freepbx/tasks/main.yml @@ -1,15 +1,15 @@ --- -- import_tasks: ../include_taskss/disable_selinux.yml +- import_tasks: ../includes/disable_selinux.yml tags: fpbx -- include_tasks_tasks: directories.yml +- include_tasks: directories.yml tags: always -- include_tasks_tasks: facts.yml +- include_tasks: facts.yml tags: always -- include_tasks_tasks: archive_pre.yml +- include_tasks: archive_pre.yml when: fpbx_install_mode | default('none') == 'upgrade' tags: always -- include_tasks_tasks: install.yml +- include_tasks: install.yml tags: always - include_tasks: conf.yml tags: always diff --git a/roles/lemonldap_ng/files/logos/wbo.png b/roles/lemonldap_ng/files/logos/wbo.png new file mode 100644 index 0000000000000000000000000000000000000000..f872277f58ddbc70ecc5bf8db5d4813d18faac60 GIT binary patch literal 1316 zcmV+<1>5?GP)EX>4Tx04R}tkv&MmKpe$iQ$>;b0d^4SkfAzR5EXIMDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|=;Wm6A|?JWDYS_3;J6>}?mh0_0YbgZG^=AA&~)2O zCE{WxyDE0QLO=uq=tD$imN6$uN%)Shdj$A;7vov}=l&eMYR+OnKqQ`JhG`RT5KnK~ z2Iqa^Fe}O`@j3CBNf#u3C`-Nm{=^dvC_t@Xlle$#8Fk#DPPEV zta9Gstd*;*c~AbrP)=W2<~q#?5?I6%B#2N@MG0lth|#K(Vj)HQaUcJ%>zBx-kgEhn zjs;YpL3aJ%fAG6oD?d5mC57TZ=ZoWfi~wD`K%?e3-^Y&AI01ssz?I(eSL(pbC+W48 z7Ci#`w}Ff6mZt0hmpj1FlOdb3D+Or^`8@D`M&FbL25*6$HLthkK29HiGQho;x;O3h0Q}G6N z;-v8^Ul`^6#olBrOU$?8W4wq<3YjjvfGy}AtMZfM_C>|srT7*f;qD~j0z8Q!JdGnF z+l^1~z*r5~h}FgV%y?sY6ZuoH1J4wDSK=2;YFGKy*k4Jc0X$lfn_hA8jCk$xVsB?c z*%k(IZ?QfNhjC1i2b)rYzvI?I_7S{NtXJWQc9dU{*B@Q%-G&b;O5Teh*Wh5`t;>=p z4J^f)32m0$>by*mQ2UGZ=~$n{dowX^l-!|^mSR0=Vol{eiPzl9{$H3`tk>hQ(C{2= z$EQUeY%OF@#lE^8n1}De?NywCbMt!*?n?PIi}T@{9P)NvzNB6HeHV8Y>vQlHK2KYHsm0yyRM1bAKG4=k)|U|rj?7E8 z;hx02ugSgXG5(@_2FBWccjLnRzM$gr6-{E^kMHB1p7BmULs1Mzh5MJJjJCuRC6=Yk zmUe3PJ5U(V=!$#74ZC7gqhG8IW%qY-^4(K0pfQRcEJp2_$%_G;*y+)Ga1v<%d7;U^Fr5q;!};#Q4|qN$b`#$3lmT5ys_RBM8>z@0!s9Wb aWB3P2v$dw{9IAN$0000