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 0000000..f872277 Binary files /dev/null and b/roles/lemonldap_ng/files/logos/wbo.png differ diff --git a/roles/unifi/defaults/main.yml b/roles/unifi/defaults/main.yml index 907a33b..b6e4c38 100644 --- a/roles/unifi/defaults/main.yml +++ b/roles/unifi/defaults/main.yml @@ -1,10 +1,16 @@ --- +# Where unifi will be installed unifi_root_dir: /opt/unifi -unifi_version: 6.5.55 +# Version to deploy +unifi_version: 7.0.23 +# URL to get the installation tarball unifi_archive_url: https://www.ubnt.com/downloads/unifi/{{ unifi_version }}/UniFi.unix.zip -unifi_archive_sha1: 8edc8081ab99eeeb2bdba28f1cfea6e4ce052c98 +# Expected sha256 +unifi_archive_sha256: 90fc6d87254cf211f6e4a8b010265d6365b9fae1e78e20cb023c8af8b406fc21 +# Should ansible handle upgrades (if False, only initial install will be done) unifi_manage_upgrade: True +# List of ports used by UniFi controler unifi_http_port: 8080 unifi_https_port: 8443 unifi_portal_http_port: 8880 @@ -16,7 +22,9 @@ unifi_http_ports: - "{{ unifi_portal_https_port }}" unifi_stun_ports: - 3478 +# List of IP addresses/CIDR having access to http ports unifi_http_src_ip: [] +# List of IP addresses/CIDR having access to stun ports unifi_stun_src_ip: [] # Max memory, in MB unifi_mem_limit: 2048 diff --git a/roles/unifi/tasks/main.yml b/roles/unifi/tasks/main.yml index 2f0ce83..41c486f 100644 --- a/roles/unifi/tasks/main.yml +++ b/roles/unifi/tasks/main.yml @@ -107,7 +107,7 @@ get_url: url: "{{ unifi_archive_url }}" dest: "{{ unifi_root_dir }}/tmp" - checksum: "sha1:{{ unifi_archive_sha1 }}" + checksum: "sha256:{{ unifi_archive_sha256 }}" when: unifi_install_mode != 'none' tags: unifi @@ -236,4 +236,5 @@ copy: content={{ unifi_version }} dest={{ unifi_root_dir }}/meta/ansible_version tags: unifi -- include: filebeat.yml +- include_tasks: filebeat.yml + tags: always