diff --git a/roles/glpi/defaults/main.yml b/roles/glpi/defaults/main.yml index 73c07ba..da5294b 100644 --- a/roles/glpi/defaults/main.yml +++ b/roles/glpi/defaults/main.yml @@ -2,9 +2,9 @@ glpi_id: 1 glpi_manage_upgrade: True -glpi_version: '10.0.8' +glpi_version: '10.0.9' glpi_archive_url: https://github.com/glpi-project/glpi/releases/download/{{ glpi_version }}/glpi-{{ glpi_version }}.tgz -glpi_archive_sha256: 757dd8f440b999c014aa94f0f860830904a89ae3bc5c2f25f2da9a509c07aaf8 +glpi_archive_sha256: d104c7135b1924f32ab6ca831fbaf319893af0bd932a035cb93ccb4021b2a946 glpi_root_dir: /opt/glpi_{{ glpi_id }} glpi_php_user: php-glpi_{{ glpi_id }} # If set, will use the following custom PHP FPM pool, which must be created diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml index b5c8682..4270981 100644 --- a/roles/kimai/defaults/main.yml +++ b/roles/kimai/defaults/main.yml @@ -5,12 +5,12 @@ # You can set it to a number or a simple string (no special chars) kimai_id: 1 # Kimai version to deploy -kimai_version: '2.0.27' +kimai_version: '2.0.28' # URL of the archive kimai_archive_url: https://github.com/kevinpapst/kimai2/archive/refs/tags/{{ kimai_version }}.tar.gz # Expected sha256 of the archive -kimai_archive_sha256: 9af179f3ae5a71452f4d082f92ebdbbbef962b016add5fade98949c052b1169a +kimai_archive_sha256: 0a5f7406b68d31c4911415fdb7ae9cfccad9433d9e15756be22bbbd32f63402d # Directory where kimai will be installed kimai_root_dir: /opt/kimai_{{ kimai_id }} diff --git a/roles/nomad/tasks/facts.yml b/roles/nomad/tasks/facts.yml index 96efb83..1b00aa0 100644 --- a/roles/nomad/tasks/facts.yml +++ b/roles/nomad/tasks/facts.yml @@ -1,5 +1,14 @@ --- +# Load distribution specific variables +- include_vars: "{{ item }}" + with_first_found: + - "{{ role_path }}/vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml" + - "{{ role_path }}/vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml" + - "{{ role_path }}/vars/{{ ansible_distribution }}.yml" + - "{{ role_path }}/vars/{{ ansible_os_family }}.yml" + tags: nomad + - block: - name: Detect installed version shell: /usr/local/bin/nomad version | perl -ne '/Nomad v(\d+(\.\d+)*)\s.*/ && print "$1\n"' diff --git a/roles/nomad/vars/RedHat.yml b/roles/nomad/vars/RedHat.yml index 2c0d23b..e0753de 100644 --- a/roles/nomad/vars/RedHat.yml +++ b/roles/nomad/vars/RedHat.yml @@ -14,6 +14,5 @@ nomad_task_driver_packages: - qemu-kvm podman: - podman - - podman-docker containerd-driver: - containerd.io diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains index 1d7993e..70c6b5d 100644 --- a/roles/squid/files/acl/software_various.domains +++ b/roles/squid/files/acl/software_various.domains @@ -310,6 +310,7 @@ cdn-ubi.redhat.com static.rust-lang.org crates.io static.crates.io +index.crates.io # Fontawesome npm.fontawesome.com